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

Using eo::mpi::DEFAULT_MASTER instead of raw constants.

Browse source
This commit is contained in:
Benjamin Bouvier 2012-07-03 14:51:34 +02:00
commit 564cc3bccd
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
eo/src/mpi/eoMpi.h
View file

@ -34,6 +34,7 @@ namespace eo
const int Finish = 1; const int Finish = 1;
} }
const int DEFAULT_MASTER = 0;
template< typename JobData, typename Wrapped > template< typename JobData, typename Wrapped >
struct SharedDataFunction struct SharedDataFunction

6
eo/test/mpi/parallelApply.cpp
View file

@ -111,9 +111,9 @@ int main(int argc, char** argv)
for( unsigned int i = 0; i < tests.size(); ++i ) for( unsigned int i = 0; i < tests.size(); ++i )
{ {
// ParallelApply<int> job( plusOneInstance, v, *(tests[i].assign), 0, store, 3 ); // ParallelApply<int> job( plusOneInstance, v, *(tests[i].assign), 0, store, 3 );
ParallelApplyStore< int > store( plusOneInstance, v, 0, 3 ); ParallelApplyStore< int > store( plusOneInstance, v, eo::mpi::DEFAULT_MASTER, 3 );
// Job< JobData<int> > job( *(tests[i].assign), 0, store ); // Job< JobData<int> > job( *(tests[i].assign), eo::mpi::DEFAULT_MASTER, store );
ParallelApply< int > job( *(tests[i].assign), 0, store ); ParallelApply< int > job( *(tests[i].assign), eo::mpi::DEFAULT_MASTER, store );
if( job.isMaster() ) if( job.isMaster() )
{ {

4
eo/test/mpi/wrapper.cpp
View file

@ -60,10 +60,10 @@ int main(int argc, char** argv)
StaticAssignmentAlgorithm assign( v.size() ); StaticAssignmentAlgorithm assign( v.size() );
ParallelApplyStore< int > store( plusOneInstance, v, 0, 1 ); ParallelApplyStore< int > store( plusOneInstance, v, eo::mpi::DEFAULT_MASTER, 1 );
store.wrapIsFinished( new ShowWrappedResult<int> ); store.wrapIsFinished( new ShowWrappedResult<int> );
ParallelApply<int> job( assign, 0, store ); ParallelApply<int> job( assign, eo::mpi::DEFAULT_MASTER, store );
// Equivalent to: // Equivalent to:
// Job< ParallelApplyData<int> > job( assign, 0, store ); // Job< ParallelApplyData<int> > job( assign, 0, store );
job.run(); job.run();