X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMTest%2Ftest_MPI_Access_ISend_IRecv_BottleNeck.cxx;h=5a5263ac313ded73b1a5cc256fbbedcd726baad3;hb=4c22ba01f2901896d1ec9ca302640f4d7e50d147;hp=c860e6734983e7e15a7105a098741a165974b043;hpb=75943f980f7b908052ef03c2c0154508f4b0a039;p=tools%2Fmedcoupling.git

diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
index c860e6734..5a5263ac3 100644
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
+++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  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
@@ -39,11 +39,11 @@
 #define ENABLE_FORCED_FAILURES
 
 using namespace std;
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
 
-  cout << "test_MPI_Access_ISend_IRecv_BottleNeck" << endl ;
+  debugStream << "test_MPI_Access_ISend_IRecv_BottleNeck" << endl ;
 
 //  MPI_Init(&argc, &argv) ; 
 
@@ -54,19 +54,20 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
 
   if ( size < 2 ) {
     ostringstream strstream ;
-    strstream << "test_MPI_Access_ISend_IRecv_BottleNeck must be runned with 2 procs"
+    strstream << "test_MPI_Access_ISend_IRecv_BottleNeck must be run with 2 procs"
               << endl ;
-    cout << strstream.str() << endl ;
-    CPPUNIT_FAIL( strstream.str() ) ;
+    cerr << strstream.str() << endl ;
+    //CPPUNIT_FAIL( strstream.str() ) ;
+    return;
   }
 
-  cout << "test_MPI_Access_ISend_IRecv_BottleNeck" << myrank << endl ;
+  debugStream << "test_MPI_Access_ISend_IRecv_BottleNeck" << 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 ) ;
 
 #define maxreq 10000
 
@@ -87,13 +88,13 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
      if ( myrank == 0 ) {
        sendbuf[i] = i ;
        sts = mpi_access.ISend(sendbuf,i,MPI_INT,target, SendRequestId[i]) ;
-       cout << "test" << myrank << " ISend RequestId " << SendRequestId[i]
+       debugStream << "test" << myrank << " ISend RequestId " << SendRequestId[i]
             << " tag " << mpi_access.sendMPITag(target) << endl ;
      }
      else {
        //sleep( 1 ) ;
        sts = mpi_access.IRecv(recvbuf,i,MPI_INT,target, RecvRequestId[i]) ;
-       cout << "test" << myrank << " IRecv RequestId " << RecvRequestId[i]
+       debugStream << "test" << myrank << " IRecv RequestId " << RecvRequestId[i]
             << " tag " << mpi_access.recvMPITag(target) << endl ;
        int recvreqsize = mpi_access.recvRequestIdsSize() ;
        int * recvrequests = new int[ recvreqsize ] ;
@@ -106,14 +107,14 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
             int source, tag, error, outcount ;
             mpi_access.status( recvrequests[j], source, tag, error, outcount,
                                true ) ;
-            cout << "test" << myrank << " Test(Recv RequestId "
+            debugStream << "test" << myrank << " Test(Recv RequestId "
                  << recvrequests[j] << ") : source " << source << " tag " << tag
                  << " error " << error << " outcount " << outcount
                  << " flag " << flag << " : DeleteRequest" << endl ;
             mpi_access.deleteRequest( recvrequests[j] ) ;
           }
           else {
-//            cout << "test" << myrank << " Test(Recv RequestId "
+//            debugStream << "test" << myrank << " Test(Recv RequestId "
 //                 << recvrequests[j] << ") flag " << flag << endl ;
           }
        }
@@ -123,7 +124,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
        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 ;
      }
 
@@ -133,60 +134,57 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
                  << "test" << myrank << " KO"
                  << "==========================================================="
                  << endl ;
-       cout << strstream.str() << endl ;
+       debugStream << strstream.str() << endl ;
        CPPUNIT_FAIL( strstream.str() ) ;
      }
   }
 
-  mpi_access.check() ;
+  if(MPI_ACCESS_VERBOSE) mpi_access.check() ;
   if ( myrank == 0 ) {
-    int size = mpi_access.sendRequestIdsSize() ;
-    cout << "test" << myrank << " before WaitAll sendreqsize " << size << endl ;
+    int size2 = mpi_access.sendRequestIdsSize() ;
+    debugStream << "test" << myrank << " before WaitAll sendreqsize " << size2 << endl ;
     mpi_access.waitAll(maxreq, SendRequestId) ;
-    size = mpi_access.sendRequestIdsSize() ;
-    cout << "test" << myrank << " after WaitAll sendreqsize " << size << endl ;
-    int * ArrayOfSendRequests = new int[ size ] ;
-    int nSendRequest = mpi_access.sendRequestIds( size , ArrayOfSendRequests ) ;
-    int i ;
+    size2 = mpi_access.sendRequestIdsSize() ;
+    debugStream << "test" << myrank << " after WaitAll sendreqsize " << size2 << endl ;
+    int * ArrayOfSendRequests = new int[ size2 ] ;
+    int nSendRequest = mpi_access.sendRequestIds( size2 , ArrayOfSendRequests ) ;
     for ( i = 0 ; i < nSendRequest ; i++ ) {
        mpi_access.deleteRequest( ArrayOfSendRequests[i] ) ;
     }
     delete [] ArrayOfSendRequests ;
   }
   else {
-    int size = mpi_access.recvRequestIdsSize() ;
-    cout << "test" << myrank << " before WaitAll recvreqsize " << size << endl ;
+    int size2 = mpi_access.recvRequestIdsSize() ;
+    debugStream << "test" << myrank << " before WaitAll recvreqsize " << size2 << endl ;
     mpi_access.waitAll(maxreq, RecvRequestId) ;
-    size = mpi_access.recvRequestIdsSize() ;
-    cout << "test" << myrank << " after WaitAll recvreqsize " << size << endl ;
-    int * ArrayOfRecvRequests = new int[ size ] ;
-    int nRecvRequest = mpi_access.recvRequestIds( size , ArrayOfRecvRequests ) ;
-    int i ;
+    size2 = mpi_access.recvRequestIdsSize() ;
+    debugStream << "test" << myrank << " after WaitAll recvreqsize " << size2 << endl ;
+    int * ArrayOfRecvRequests = new int[ size2 ] ;
+    int nRecvRequest = mpi_access.recvRequestIds( size2 , ArrayOfRecvRequests ) ;
     for ( i = 0 ; i < nRecvRequest ; i++ ) {
        mpi_access.deleteRequest( ArrayOfRecvRequests[i] ) ;
     }
     delete [] ArrayOfRecvRequests ;
   }
-  mpi_access.check() ;
+  if(MPI_ACCESS_VERBOSE) mpi_access.check() ;
 
   if ( myrank == 0 ) {
     int sendrequests[maxreq] ;
     int sendreqsize = mpi_access.sendRequestIds( target , maxreq , sendrequests ) ;
-    int i ;
     if ( sendreqsize != 0 ) {
       ostringstream strstream ;
       strstream << "=========================================================" << endl
                 << "test" << myrank << " sendreqsize " << sendreqsize << " KO" << endl
                 << "=========================================================" << endl ;
-      cout << strstream.str() << endl ;
+      debugStream << strstream.str() << endl ;
       for ( i = 0 ; i < sendreqsize ; i++ ) {
-         cout << "test" << myrank << " sendrequests[ " << i << " ] = "
+         debugStream << "test" << myrank << " sendrequests[ " << i << " ] = "
               << sendrequests[i] << endl ;
       }
       CPPUNIT_FAIL( strstream.str() ) ;
     }
     else {
-      cout << "=========================================================" << endl
+      debugStream << "=========================================================" << endl
            << "test" << myrank << " sendreqsize " << sendreqsize << " OK" << endl
            << "=========================================================" << endl ;
     }
@@ -199,11 +197,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
       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 ;
     }
@@ -215,7 +213,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() {
 
 //  MPI_Finalize();
 
-  cout << "test" << myrank << " OK" << endl ;
+  debugStream << "test" << myrank << " OK" << endl ;
 
   return ;
 }