portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Clean up verbose communicator create

Browse Source
This commit is contained in:
paboyle 2017-11-27 12:32:37 +00:00
parent 94b8fb5686
commit 4bfc8c85c3
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/communicator/Communicator_base.cc
View File

@ -176,34 +176,36 @@ CartesianCommunicator::CartesianCommunicator(const std::vector<int> &processors,
MPI_Comm comm_split; MPI_Comm comm_split;
if ( Nchild > 1 ) { if ( Nchild > 1 ) {
std::cout << GridLogMessage<<"Child communicator of "<< std::hex << parent.communicator << std::dec<<std::endl; if(0){
std::cout << GridLogMessage<<" parent grid["<< parent._ndimension<<"] "; std::cout << GridLogMessage<<"Child communicator of "<< std::hex << parent.communicator << std::dec<<std::endl;
for(int d=0;d<parent._ndimension;d++) std::cout << parent._processors[d] << " "; std::cout << GridLogMessage<<" parent grid["<< parent._ndimension<<"] ";
std::cout<<std::endl; for(int d=0;d<parent._ndimension;d++) std::cout << parent._processors[d] << " ";
std::cout<<std::endl;
std::cout << GridLogMessage<<" child grid["<< _ndimension <<"] ";
for(int d=0;d<processors.size();d++) std::cout << processors[d] << " "; std::cout << GridLogMessage<<" child grid["<< _ndimension <<"] ";
std::cout<<std::endl; for(int d=0;d<processors.size();d++) std::cout << processors[d] << " ";
std::cout<<std::endl;
std::cout << GridLogMessage<<" old rank "<< parent._processor<<" coor ["<< parent._ndimension <<"] ";
for(int d=0;d<parent._ndimension;d++) std::cout << parent._processor_coor[d] << " "; std::cout << GridLogMessage<<" old rank "<< parent._processor<<" coor ["<< parent._ndimension <<"] ";
std::cout<<std::endl; for(int d=0;d<parent._ndimension;d++) std::cout << parent._processor_coor[d] << " ";
std::cout<<std::endl;
std::cout << GridLogMessage<<" new split "<< srank<<" scoor ["<< _ndimension <<"] ";
for(int d=0;d<processors.size();d++) std::cout << scoor[d] << " "; std::cout << GridLogMessage<<" new split "<< srank<<" scoor ["<< _ndimension <<"] ";
std::cout<<std::endl; for(int d=0;d<processors.size();d++) std::cout << scoor[d] << " ";
std::cout<<std::endl;
std::cout << GridLogMessage<<" new rank "<< crank<<" coor ["<< _ndimension <<"] ";
for(int d=0;d<processors.size();d++) std::cout << ccoor[d] << " "; std::cout << GridLogMessage<<" new rank "<< crank<<" coor ["<< _ndimension <<"] ";
std::cout<<std::endl; for(int d=0;d<processors.size();d++) std::cout << ccoor[d] << " ";
std::cout<<std::endl;
}
int ierr= MPI_Comm_split(parent.communicator,srank,crank,&comm_split); int ierr= MPI_Comm_split(parent.communicator,srank,crank,&comm_split);
assert(ierr==0); assert(ierr==0);
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
// Declare victory // Declare victory
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
std::cout << GridLogMessage<<"Divided communicator "<< parent._Nprocessors<<" into " // std::cout << GridLogMessage<<"Divided communicator "<< parent._Nprocessors<<" into "
<< Nchild <<" communicators with " << childsize << " ranks"<<std::endl; // << Nchild <<" communicators with " << childsize << " ranks"<<std::endl;
} else { } else {
comm_split=parent.communicator; comm_split=parent.communicator;
srank = 0; srank = 0;
@ -214,9 +216,11 @@ CartesianCommunicator::CartesianCommunicator(const std::vector<int> &processors,
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
InitFromMPICommunicator(processors,comm_split); InitFromMPICommunicator(processors,comm_split);
std::cout << " ndim " <<_ndimension<<" " << parent._ndimension << std::endl; if(0){
for(int d=0;d<processors.size();d++){ std::cout << " ndim " <<_ndimension<<" " << parent._ndimension << std::endl;
std::cout << d<< " " << _processor_coor[d] <<" " << ccoor[d]<<std::endl; for(int d=0;d<processors.size();d++){
std::cout << d<< " " << _processor_coor[d] <<" " << ccoor[d]<<std::endl;
}
} }
for(int d=0;d<processors.size();d++){ for(int d=0;d<processors.size();d++){
assert(_processor_coor[d] == ccoor[d] ); assert(_processor_coor[d] == ccoor[d] );
@ -246,7 +250,7 @@ void CartesianCommunicator::InitFromMPICommunicator(const std::vector<int> &proc
MPI_Comm_rank(communicator,&_processor); MPI_Comm_rank(communicator,&_processor);
MPI_Cart_coords(communicator,_processor,_ndimension,&_processor_coor[0]); MPI_Cart_coords(communicator,_processor,_ndimension,&_processor_coor[0]);
if ( communicator_base != communicator_world ) { if ( 0 && (communicator_base != communicator_world) ) {
std::cout << "InitFromMPICommunicator Cartesian communicator created with a non-world communicator"<<std::endl; std::cout << "InitFromMPICommunicator Cartesian communicator created with a non-world communicator"<<std::endl;
std::cout << " new communicator rank "<<_processor<< " coor ["<<_ndimension<<"] "; std::cout << " new communicator rank "<<_processor<< " coor ["<<_ndimension<<"] ";