File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -510,7 +510,7 @@ double PartitionModel::computeMarginalLh() {
510510 sub_tree2->optimize_by_newton = tree2->params ->optimize_by_newton ;
511511 sub_tree2->setLikelihoodKernel (tree2->params ->SSE );
512512 sub_tree2->setNumThreads (tree2->num_threads );
513- sub_tree2->ensureNumberOfThreadsIsSet (nullptr );
513+ // sub_tree2->ensureNumberOfThreadsIsSet(nullptr);
514514
515515 sub_tree2->initializeAllPartialLh ();
516516
Original file line number Diff line number Diff line change 4343#define PACKETS_PER_THREAD 2
4444void PhyloTree::setNumThreads (int threadCount) {
4545 if (!isSuperTree () && aln!=nullptr && threadCount > 1 && threadCount > aln->getNPattern ()/8 ) {
46- outWarning (convertIntToString (threadCount) + " threads for alignment length " +
47- convertIntToString (aln->getNPattern ()) + " will slow down analysis" );
46+ if (!params->marginal_lh_aic ) {
47+ outWarning (convertIntToString (threadCount) + " threads for alignment length " +
48+ convertIntToString (aln->getNPattern ()) + " will slow down analysis" );
49+ }
4850 threadCount = max (aln->getNPattern ()/8 ,(size_t )1 );
4951 }
5052 this ->num_threads = threadCount;
You can’t perform that action at this time.
0 commit comments