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

remove threshold parameter and move from static schedule to dynamic

Browse source
This commit is contained in:
Caner Candan 2010-11-22 14:47:55 +01:00
commit 78b4da4c31
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eo/src/omp_apply.h
View file

@ -40,7 +40,7 @@
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)
{ {
#pragma omp parallel for default(none) shared(_proc, _pop) #pragma omp parallel for default(none) shared(_proc, _pop) schedule(dynamic)
for (unsigned i = 0; i < _pop.size(); ++i) for (unsigned i = 0; i < _pop.size(); ++i)
{ {
//#pragma omp critical //#pragma omp critical

8
eo/test/t-openmp.cpp
View file

@ -39,8 +39,6 @@ int main(int ac, char** av)
unsigned int nRun = parser.getORcreateParam((unsigned int)100, "nRun", "Number of runs", 'r', "Evolution Engine").value(); unsigned int nRun = parser.getORcreateParam((unsigned int)100, "nRun", "Number of runs", 'r', "Evolution Engine").value();
double threshold = parser.getORcreateParam((double)3.0, "threshold", "Threshold of max speedup", 0, "Evolution Engine").value();
std::string speedupFileName = parser.getORcreateParam(std::string("speedup"), "speedupFileName", "Speedup file name", 0, "Results").value(); std::string speedupFileName = parser.getORcreateParam(std::string("speedup"), "speedupFileName", "Speedup file name", 0, "Results").value();
std::string efficiencyFileName = parser.getORcreateParam(std::string("efficiency"), "efficiencyFileName", "Efficiency file name", 0, "Results").value(); std::string efficiencyFileName = parser.getORcreateParam(std::string("efficiency"), "efficiencyFileName", "Efficiency file name", 0, "Results").value();
@ -64,7 +62,7 @@ int main(int ac, char** av)
eoUniformGenerator< double > gen(-5, 5); eoUniformGenerator< double > gen(-5, 5);
std::ostringstream params; std::ostringstream params;
params << "-p" << popMin << "-P" << popMax << "-d" << dimMin << "-D" << dimMax << "-r" << nRun << "-t" << threshold << "-s" << seedParam; params << "-p" << popMin << "-P" << popMax << "-d" << dimMin << "-D" << dimMax << "-r" << nRun << "-s" << seedParam;
std::ofstream speedupFile( std::string( speedupFileName + params.str() ).c_str() ); std::ofstream speedupFile( std::string( speedupFileName + params.str() ).c_str() );
std::ofstream efficiencyFile( std::string( efficiencyFileName + params.str() ).c_str() ); std::ofstream efficiencyFile( std::string( efficiencyFileName + params.str() ).c_str() );
@ -107,10 +105,10 @@ int main(int ac, char** av)
Tp = t2 - t1; Tp = t2 - t1;
} }
if ( ( Ts / Tp ) > threshold ) { continue; } if ( ( Ts / Tp ) > nbtask ) { continue; }
speedupFile << Ts / Tp << ' '; speedupFile << Ts / Tp << ' ';
efficiencyFile << Ts / ( nbtask * Tp ); efficiencyFile << Ts / ( nbtask * Tp ) << ' ';
eo::log << eo::debug; eo::log << eo::debug;
eo::log << "Ts = " << Ts << std::endl; eo::log << "Ts = " << Ts << std::endl;