X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMTest%2Ftest_MPI_Access_ISendRecv.cxx;h=b934f444a3cd9d79f3a4784fc477e7f9c65a289e;hb=d426837c21eca9b56b9b8a7a7434aaf3969c8977;hp=055a1966ea1d8c4995823e931321d52285247241;hpb=75943f980f7b908052ef03c2c0154508f4b0a039;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx index 055a1966e..b934f444a 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -38,11 +38,11 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISendRecv() { - cout << "test_MPI_Access_ISendRecv" << endl ; + debugStream << "test_MPI_Access_ISendRecv" << endl ; // MPI_Init(&argc, &argv) ; @@ -52,17 +52,18 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { MPI_Comm_rank(MPI_COMM_WORLD,&myrank) ; if ( size < 2 ) { - cout << "test_MPI_Access_ISendRecv must be runned with 2 procs" << endl ; - CPPUNIT_FAIL("test_MPI_Access_ISendRecv must be runned with 2 procs") ; + cerr << "test_MPI_Access_ISendRecv must be runned with 2 procs" << endl ; + //CPPUNIT_FAIL("test_MPI_Access_ISendRecv must be runned with 2 procs") ; + return; } - cout << "test_MPI_Access_ISendRecv" << myrank << endl ; + debugStream << "test_MPI_Access_ISendRecv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; @@ -81,14 +82,14 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { sendbuf[i] = i ; sts = mpi_access.ISendRecv(&sendbuf[i],1,MPI_INT,target, SendRequestId[i], &recvbuf[i],1,MPI_INT,target, RecvRequestId[i]) ; - cout << "test" << myrank << " Send sendRequestId " << SendRequestId[i] + debugStream << "test" << myrank << " Send sendRequestId " << SendRequestId[i] << " tag " << mpi_access.sendMPITag(target) << " recvRequestId " << RecvRequestId[i] << " tag " << mpi_access.recvMPITag(target) << endl ; char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; mpi_access.errorString(sts, msgerr, &lenerr) ; - cout << "test" << myrank << " lenerr " << lenerr + debugStream << "test" << myrank << " lenerr " << lenerr << " " << msgerr << endl ; if ( sts != MPI_SUCCESS ) { @@ -97,34 +98,34 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { << "test" << myrank << " KO" << "===========================================================" << endl ; - cout << strstream.str() << endl ; + debugStream << strstream.str() << endl ; CPPUNIT_FAIL( strstream.str() ) ; } int j ; for (j = 0 ; j <= i ; j++) { int flag ; if ( j < i ) { - cout << "test" << myrank << " " << j << " -> Test-Send("<< SendRequestId[j] + debugStream << "test" << myrank << " " << j << " -> Test-Send("<< SendRequestId[j] << ")" << endl ; mpi_access.test( SendRequestId[j], flag ) ; if ( flag ) { int target, tag, error, outcount ; mpi_access.status( SendRequestId[j], target, tag, error, outcount, true ) ; - cout << "test" << myrank << " Send RequestId " << SendRequestId[j] + debugStream << "test" << myrank << " Send RequestId " << SendRequestId[j] << " target " << target << " tag " << tag << " error " << error << endl ; mpi_access.deleteRequest( SendRequestId[j] ) ; } } - cout << "test" << myrank << " " << j << " -> Test-Recv("<< SendRequestId[j] + debugStream << "test" << myrank << " " << j << " -> Test-Recv("<< SendRequestId[j] << ")" << endl ; mpi_access.test( RecvRequestId[j], flag ) ; if ( flag ) { int source, tag, error, outcount ; mpi_access.status( RecvRequestId[j], source, tag, error, outcount, true ) ; - cout << "test" << myrank << " Recv RequestId" << j << " " + debugStream << "test" << myrank << " Recv RequestId" << j << " " << RecvRequestId[j] << " source " << source << " tag " << tag << " error " << error << " outcount " << outcount << endl ; if ( (outcount != 1) | (recvbuf[j] != j) ) { @@ -134,15 +135,15 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { << outcount << " recvbuf[ " << j << " ] " << recvbuf[j] << " KO" << "===========================================================" << endl ; - cout << strstream.str() << endl ; + debugStream << strstream.str() << endl ; CPPUNIT_FAIL( strstream.str() ) ; } } } mpi_access.errorString(sts, msgerr, &lenerr) ; - cout << "test" << myrank << " lenerr " << lenerr << " " + debugStream << "test" << myrank << " lenerr " << lenerr << " " << msgerr << endl ; - mpi_access.check() ; + if(MPI_ACCESS_VERBOSE) mpi_access.check() ; } int flag ; @@ -153,7 +154,7 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { if ( !flag ) { ostringstream strstream ; strstream << "test" << myrank << " flag " << flag << " KO" << endl ; - cout << strstream.str() << endl ; + debugStream << strstream.str() << endl ; CPPUNIT_FAIL( strstream.str() ) ; } @@ -164,10 +165,10 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { if ( !flag ) { ostringstream strstream ; strstream << "test" << myrank << " flag " << flag << " KO" << endl ; - cout << strstream.str() << endl ; + debugStream << strstream.str() << endl ; CPPUNIT_FAIL( strstream.str() ) ; } - mpi_access.check() ; + if(MPI_ACCESS_VERBOSE) mpi_access.check() ; int sendrequests[10] ; int sendreqsize = mpi_access.sendRequestIds( target , 10 , sendrequests ) ; @@ -176,11 +177,11 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { strstream << "=========================================================" << endl << "test" << myrank << " sendreqsize " << sendreqsize << " KO" << endl << "=========================================================" << endl ; - cout << strstream.str() << endl ; + debugStream << strstream.str() << endl ; CPPUNIT_FAIL( strstream.str() ) ; } else { - cout << "=========================================================" << endl + debugStream << "=========================================================" << endl << "test" << myrank << " sendreqsize " << sendreqsize << " OK" << endl << "=========================================================" << endl ; } @@ -191,11 +192,11 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { strstream << "=========================================================" << endl << "test" << myrank << " recvreqsize " << recvreqsize << " KO" << endl << "=========================================================" << endl ; - cout << strstream.str() << endl ; + debugStream << strstream.str() << endl ; CPPUNIT_FAIL( strstream.str() ) ; } else { - cout << "=========================================================" << endl + debugStream << "=========================================================" << endl << "test" << myrank << " recvreqsize " << recvreqsize << " OK" << endl << "=========================================================" << endl ; } @@ -206,7 +207,7 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { // MPI_Finalize(); - cout << "test" << myrank << " OK" << endl ; + debugStream << "test" << myrank << " OK" << endl ; return ; }