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

Merge branch 'master' of ssh://localhost:8479/gitroot/eodev/eodev

Browse source
This commit is contained in:
nojhan 2011-06-17 14:59:45 +02:00
commit 34a3df1de1
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
eo/src/apply.h
View file

@ -85,35 +85,35 @@ void apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
@ingroup Utilities @ingroup Utilities
*/ */
template <class EOT> // template <class EOT>
void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop) // void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
{ // {
size_t size = _pop.size(); // size_t size = _pop.size();
#pragma omp parallel for if(eo::parallel.isEnabled()) // #pragma omp parallel for if(eo::parallel.isEnabled())
//doesnot work with gcc 4.1.2 // //doesnot work with gcc 4.1.2
//default(none) shared(_proc, _pop, size) // //default(none) shared(_proc, _pop, size)
for (size_t i = 0; i < size; ++i) // for (size_t i = 0; i < size; ++i)
{ // {
_proc(_pop[i]); // _proc(_pop[i]);
} // }
} // }
/** /**
And now we are using the dynamic scheduling. And now we are using the dynamic scheduling.
@ingroup Utilities @ingroup Utilities
*/ */
template <class EOT> // template <class EOT>
void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop) // void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
{ // {
size_t size = _pop.size(); // size_t size = _pop.size();
#pragma omp parallel for if(eo::parallel.isEnabled()) schedule(dynamic) // #pragma omp parallel for if(eo::parallel.isEnabled()) schedule(dynamic)
//doesnot work with gcc 4.1.2 // //doesnot work with gcc 4.1.2
//default(none) shared(_proc, _pop, size) // //default(none) shared(_proc, _pop, size)
for (size_t i = 0; i < size; ++i) // for (size_t i = 0; i < size; ++i)
{ // {
_proc(_pop[i]); // _proc(_pop[i]);
} // }
} // }
#endif #endif