Merge branch 'master' of ssh://localhost:8479/gitroot/eodev/eodev
This commit is contained in:
commit
34a3df1de1
1 changed files with 24 additions and 24 deletions
|
|
@ -85,35 +85,35 @@ void apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
|||
|
||||
@ingroup Utilities
|
||||
*/
|
||||
template <class EOT>
|
||||
void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
||||
{
|
||||
size_t size = _pop.size();
|
||||
#pragma omp parallel for if(eo::parallel.isEnabled())
|
||||
//doesnot work with gcc 4.1.2
|
||||
//default(none) shared(_proc, _pop, size)
|
||||
for (size_t i = 0; i < size; ++i)
|
||||
{
|
||||
_proc(_pop[i]);
|
||||
}
|
||||
}
|
||||
// template <class EOT>
|
||||
// void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
||||
// {
|
||||
// size_t size = _pop.size();
|
||||
// #pragma omp parallel for if(eo::parallel.isEnabled())
|
||||
// //doesnot work with gcc 4.1.2
|
||||
// //default(none) shared(_proc, _pop, size)
|
||||
// for (size_t i = 0; i < size; ++i)
|
||||
// {
|
||||
// _proc(_pop[i]);
|
||||
// }
|
||||
// }
|
||||
|
||||
/**
|
||||
And now we are using the dynamic scheduling.
|
||||
|
||||
@ingroup Utilities
|
||||
*/
|
||||
template <class EOT>
|
||||
void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
||||
{
|
||||
size_t size = _pop.size();
|
||||
#pragma omp parallel for if(eo::parallel.isEnabled()) schedule(dynamic)
|
||||
//doesnot work with gcc 4.1.2
|
||||
//default(none) shared(_proc, _pop, size)
|
||||
for (size_t i = 0; i < size; ++i)
|
||||
{
|
||||
_proc(_pop[i]);
|
||||
}
|
||||
}
|
||||
// template <class EOT>
|
||||
// void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
||||
// {
|
||||
// size_t size = _pop.size();
|
||||
// #pragma omp parallel for if(eo::parallel.isEnabled()) schedule(dynamic)
|
||||
// //doesnot work with gcc 4.1.2
|
||||
// //default(none) shared(_proc, _pop, size)
|
||||
// for (size_t i = 0; i < size; ++i)
|
||||
// {
|
||||
// _proc(_pop[i]);
|
||||
// }
|
||||
// }
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Reference in a new issue