Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
phylo
fastcodeml
Commits
25c70bf7
Commit
25c70bf7
authored
Mar 11, 2016
by
omid
Browse files
more correction on initial num of threads
parent
26be0e27
Changes
1
Hide whitespace changes
Inline
Side-by-side
fast.cpp
View file @
25c70bf7
...
...
@@ -85,7 +85,7 @@ int main(int aRgc, char **aRgv) {
// Adjust and report the number of threads that will be used
#ifdef _OPENMP
int
num_threads
=
omp_get_max_threads
();
//
std::cout<<"max num of thr: "<< num_threads <<std::endl;
std
::
cout
<<
"max num of thr: "
<<
num_threads
<<
std
::
endl
;
if
((
cmd
.
mNumThreads
>=
1
)
&&
(
cmd
.
mNumThreads
<=
(
unsigned
int
)
num_threads
))
...
...
@@ -95,6 +95,7 @@ int main(int aRgc, char **aRgv) {
// std::cout<<"num of thr: "<< num_threads <<std::endl;
omp_set_num_threads
(
num_threads
);
std
::
cout
<<
"current num of thr: "
<<
num_threads
<<
std
::
endl
;
/*if (num_threads < 2)
cmd.mForceSerial = true;
else
...
...
@@ -210,8 +211,8 @@ int main(int aRgc, char **aRgv) {
std
::
cout
<<
"Branch lengths are fixed"
<<
std
::
endl
;
#ifdef _OPENMP
if
(
num_threads
>
1
)
{
std
::
cout
<<
"
N
um. threads: "
<<
num_threads
<<
std
::
endl
<<
"
N
um. cores: "
<<
omp_get_num_procs
()
<<
std
::
endl
;
std
::
cout
<<
"
Current n
um. threads: "
<<
num_threads
<<
std
::
endl
<<
"
Total n
um. cores: "
<<
omp_get_num_procs
()
<<
std
::
endl
;
}
else
#endif
{
...
...
@@ -677,10 +678,10 @@ int main(int aRgc, char **aRgv) {
if
(
cmd
.
mVerboseLevel
>=
VERBOSE_ONLY_RESULTS
)
{
if
(
cmd
.
mBranchAll
)
std
::
cout
<<
std
::
endl
<<
"Doing
all
foreground
branches
"
std
::
cout
<<
std
::
endl
<<
"Doing
for all branches (internal + leaf) as
foreground"
<<
std
::
endl
;
else
std
::
cout
<<
std
::
endl
<<
"Doing internal foreground
branches
"
std
::
cout
<<
std
::
endl
<<
"Doing
for all
internal
branches as
foreground"
<<
std
::
endl
;
std
::
cout
<<
"------------------------------------"
<<
std
::
endl
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment