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

fix(mpi): fix some namespaces issues with mpi

Browse source
This commit is contained in:
Johann Dreo 2024-08-23 10:02:22 +02:00
commit 4bbb4a595e
8 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ Authors:
# include "../eoFunctor.h"
# include "../eoExceptions.h"
# include "mpi/implMpi.h"
# include "eoMpiNode.h"
# include "eoMpiAssignmentAlgorithm.h"
@ -669,7 +670,7 @@ namespace eo
timerStat.start("master_wait_for_all_responses");
while( assignmentAlgo.availableWorkers() != totalWorkers )
{
bmpi::status status = comm.probe( bmpi::any_source, eo::mpi::Channel::Messages );
eo::mpi::status status = comm.probe( eo::mpi::any_source, eo::mpi::Channel::Messages );
int wrkRank = status.source();
that.handleResponse( wrkRank );
comm.send( wrkRank, Channel::Commands, Message::Finish );
@ -686,7 +687,7 @@ namespace eo
AssignmentAlgorithm& assignmentAlgo;
Job< JobData > & that;
bmpi::communicator & comm;
eo::mpi::communicator & comm;
};
/**
@ -713,7 +714,7 @@ namespace eo
{
eo::log << eo::debug << "[M" << comm.rank() << "] Waitin' for node..." << std::endl;
bmpi::status status = comm.probe( bmpi::any_source, eo::mpi::Channel::Messages );
eo::mpi::status status = comm.probe( eo::mpi::any_source, eo::mpi::Channel::Messages );
int wrkRank = status.source();
eo::log << eo::debug << "[M" << comm.rank() << "] Node " << wrkRank << " just terminated." << std::endl;
@ -797,7 +798,7 @@ namespace eo
AssignmentAlgorithm& assignmentAlgo;
int masterRank;
const int workerStopCondition;
bmpi::communicator& comm;
eo::mpi::communicator& comm;
JobStore<JobData>& store;
SendTaskFunction<JobData> & sendTask;