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

* changed apply.h to use new parallelization s parameters

Browse source
This commit is contained in:
Caner Candan 2010-12-26 19:09:08 +01:00
commit 40817a0931
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
eo/src/apply.h
View file

@ -26,7 +26,7 @@
#ifndef _apply_h #ifndef _apply_h
#define _apply_h #define _apply_h
#include <utils/eoParser.h> #include <utils/eoParallel.h>
#include <eoFunctor.h> #include <eoFunctor.h>
#include <vector> #include <vector>
#include <omp.h> #include <omp.h>
@ -39,14 +39,22 @@
template <class EOT> template <class EOT>
void apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop) void apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
{ {
size_t size = _pop.size();
double t1 = omp_get_wtime(); double t1 = omp_get_wtime();
size_t size = _pop.size(); if (!eo::parallel.isDynamic())
#pragma omp parallel for if(eo::parallelizeLoopParam.value()) //default(none) shared(_proc, _pop, size) {
for (size_t i = 0; i < size; ++i) #pragma omp parallel for if(eo::parallel.isEnabled()) //default(none) shared(_proc, _pop, size)
{ for (size_t i = 0; i < size; ++i) { _proc(_pop[i]); }
_proc(_pop[i]); }
} else
{
#pragma omp parallel for schedule(dynamic) 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]); }
}
double t2 = omp_get_wtime(); double t2 = omp_get_wtime();
@ -63,7 +71,9 @@ 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::parallelizeLoopParam.value()) //default(none) shared(_proc, _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) for (size_t i = 0; i < size; ++i)
{ {
_proc(_pop[i]); _proc(_pop[i]);
@ -79,7 +89,9 @@ 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::parallelizeLoopParam.value()) schedule(dynamic) //default(none) shared(_proc, _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) for (size_t i = 0; i < size; ++i)
{ {
_proc(_pop[i]); _proc(_pop[i]);