nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a bug in SMP Master / Worker model when the population size is lower than the number of workers.

Browse source
This commit is contained in:
quemy 2014-05-25 21:52:22 +02:00
commit b0479a15e9
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
smp/src/scheduler.cpp
View file

@ -67,17 +67,21 @@ void paradiseo::smp::Scheduler<EOT,Policy>::operator()(eoUF<EOT&, void>& func, e
indice = i*nbIndi+j; indice = i*nbIndi+j;
} }
} }
for(unsigned i = 0; i < remaining; i++) if(nbIndi != 0) // Handle the offset if there is less individuals than workers
popPackages[i].push_back(&pop[indice+i+1]); indice++;
for(unsigned i = 0; i < remaining; i++)
popPackages[i].push_back(&pop[indice+i]);
// Starting threads // Starting threads
for(unsigned i = 0; i < workers.size(); i++) for(unsigned i = 0; i < workers.size(); i++)
workers[i] = std::thread(&Scheduler<EOT,Policy>::applyLinearPolicy, this, std::ref(func), std::ref(popPackages[i])); if(!popPackages[i].empty())
workers[i] = std::thread(&Scheduler<EOT,Policy>::applyLinearPolicy, this, std::ref(func), std::ref(popPackages[i]));
// Wait the end of tasks // Wait the end of tasks
for(unsigned i = 0; i < workers.size(); i++) for(unsigned i = 0; i < workers.size(); i++)
workers[i].join(); if(!popPackages[i].empty() && workers[i].joinable())
workers[i].join();
} }
template<class EOT, class Policy> template<class EOT, class Policy>
@ -117,7 +121,7 @@ void paradiseo::smp::Scheduler<EOT,Policy>::operator()(eoUF<EOT&, void>& func, e
} }
done = true; done = true;
for(unsigned i = 0; i < workers.size(); i++) for(unsigned i = 0; i < workers.size(); i++)
workers[i].join(); workers[i].join();
} }