From cec6e0444bc56fd8c927064cec5241688633fb86 Mon Sep 17 00:00:00 2001 From: rahuel Date: Fri, 25 Jan 2008 10:14:07 +0000 Subject: [PATCH] L'appel a CheckSent est deja fait dans AllToAll[v]. --- src/ParaMEDMEM/Test/test_AllToAllDEC.cxx | 6 +++--- src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx | 6 ++++-- src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx | 6 +++--- src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx | 9 ++++++--- src/ParaMEDMEM/test_AllToAllDEC.cxx | 10 +++++----- src/ParaMEDMEM/test_AllToAllTimeDEC.cxx | 2 ++ src/ParaMEDMEM/test_AllToAllvDEC.cxx | 10 +++++----- src/ParaMEDMEM/test_AllToAllvTimeDEC.cxx | 3 +++ 8 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx index 779ec7e99..3aea0d295 100644 --- a/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx +++ b/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx @@ -123,7 +123,7 @@ void MPIAccessDECTest::test_AllToAllDEC( bool Asynchronous ) { // cout << endl ; // cout << "test_AllToAllDEC" << myrank << " sendbuf " << sendbuf << endl ; - MPIAccessDEC->CheckSent() ; +// MPIAccessDEC->CheckSent() ; int nRecvReq = mpi_access->RecvRequestIdsSize() ; // cout << "test_AllToAllDEC" << myrank << " WaitAllRecv " << nRecvReq << " Requests" << endl ; @@ -142,8 +142,8 @@ void MPIAccessDECTest::test_AllToAllDEC( bool Asynchronous ) { // cout << endl ; } - cout << "test_AllToAllDEC" << myrank << " final CheckSent" << endl ; - MPIAccessDEC->CheckSent() ; +// cout << "test_AllToAllDEC" << myrank << " final CheckSent" << endl ; +// MPIAccessDEC->CheckSent() ; int nSendReq = mpi_access->SendRequestIdsSize() ; cout << "test_AllToAllDEC" << myrank << " final SendRequestIds " << nSendReq << " SendRequests" diff --git a/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx index 264e0dc39..43564065e 100644 --- a/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx +++ b/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx @@ -96,6 +96,7 @@ void MPIAccessDECTest::test_AllToAllTimeDEC( bool Asynchronous ) { cout << "test_AllToAllTimeDEC" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test_AllToAllTimeDEC" << myrank << " Barrier done" << endl ; #define maxproc 11 #define maxreq 10000 @@ -121,8 +122,8 @@ void MPIAccessDECTest::test_AllToAllTimeDEC( bool Asynchronous ) { // MPIAccessDEC->NextTime( nextdeltatime ) ; } MPIAccessDEC->SetTime( time , nextdeltatime ) ; -// cout << "test_AllToAllTimeDEC" << myrank << "=====TIME " << time << "=====DELTATIME " -// << nextdeltatime << "=====MAXTIME " << maxtime << " ======" << endl ; + cout << "test_AllToAllTimeDEC" << myrank << "=====TIME " << time << "=====DELTATIME " + << nextdeltatime << "=====MAXTIME " << maxtime << " ======" << endl ; int * sendbuf = new int[datamsglength*size] ; // int * sendbuf = (int *) malloc(sizeof(int)*datamsglength*size) ; int * recvbuf = new int[datamsglength*size] ; @@ -228,6 +229,7 @@ void MPIAccessDECTest::test_AllToAllTimeDEC( bool Asynchronous ) { cout << "test_AllToAllTimeDEC" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test_AllToAllTimeDEC" << myrank << " Barrier done" << endl ; delete sourcegroup ; delete targetgroup ; diff --git a/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx index 390c53459..971339d58 100644 --- a/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx +++ b/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx @@ -127,7 +127,7 @@ void MPIAccessDECTest::test_AllToAllvDEC( bool Asynchronous ) { // cout << endl ; // cout << "test_AllToAllvDEC" << myrank << " sendbuf " << sendbuf << endl ; - MPIAccessDEC->CheckSent() ; +// MPIAccessDEC->CheckSent() ; int nRecvReq = mpi_access->RecvRequestIdsSize() ; // cout << "test_AllToAllvDEC" << myrank << " WaitAllRecv " << nRecvReq << " Requests" << endl ; @@ -144,8 +144,8 @@ void MPIAccessDECTest::test_AllToAllvDEC( bool Asynchronous ) { // cout << endl ; } - cout << "test_AllToAllvDEC" << myrank << " final CheckSent" << endl ; - MPIAccessDEC->CheckSent() ; +// cout << "test_AllToAllvDEC" << myrank << " final CheckSent" << endl ; +// MPIAccessDEC->CheckSent() ; int nSendReq = mpi_access->SendRequestIdsSize() ; cout << "test_AllToAllvDEC" << myrank << " final SendRequestIds " << nSendReq << " SendRequests" diff --git a/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx index f07c8fee4..6a5dac8a2 100644 --- a/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx +++ b/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx @@ -105,9 +105,10 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat cout << "test_AllToAllvTimeDEC" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test_AllToAllvTimeDEC" << myrank << " Barrier done" << endl ; #define maxproc 11 -#define maxreq 1000 +#define maxreq 10000 #define datamsglength 10 int sts ; @@ -154,8 +155,8 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat // MPIAccessDEC->NextTime( nextdeltatime ) ; } MPIAccessDEC->SetTime( time , nextdeltatime ) ; -// cout << "test_AllToAllvTimeDEC" << myrank << "=====TIME " << time << "=====DELTATIME " -// << nextdeltatime << "=====MAXTIME " << maxtime << " ======" << endl ; + cout << "test_AllToAllvTimeDEC" << myrank << "=====TIME " << time << "=====DELTATIME " + << nextdeltatime << "=====MAXTIME " << maxtime << " ======" << endl ; int * sendbuf = new int[datamsglength*size] ; // int * sendbuf = (int *) malloc(sizeof(int)*datamsglength*size) ; int * recvbuf = new int[datamsglength*size] ; @@ -262,6 +263,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat cout << "test_AllToAllvTimeDEC" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test_AllToAllvTimeDEC" << myrank << " Barrier done" << endl ; cout << "test_AllToAllvTimeDEC" << myrank << " CheckFinalSent" << endl ; sts = MPIAccessDEC->CheckFinalSent() ; @@ -310,6 +312,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat cout << "test_AllToAllvTimeDEC" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test_AllToAllvTimeDEC" << myrank << " Barrier done" << endl ; delete sourcegroup ; delete targetgroup ; diff --git a/src/ParaMEDMEM/test_AllToAllDEC.cxx b/src/ParaMEDMEM/test_AllToAllDEC.cxx index eb787692e..d1bfb0889 100644 --- a/src/ParaMEDMEM/test_AllToAllDEC.cxx +++ b/src/ParaMEDMEM/test_AllToAllDEC.cxx @@ -94,14 +94,14 @@ int main(int argc, char** argv) { MPIAccessDEC->AllToAll( sendbuf, sendcount , MPI_INT , recvbuf, recvcount , MPI_INT ) ; - cout << "test" << myrank << " recvbuf before CheckSent" ; + cout << "test" << myrank << " recvbuf " ; for ( i = 0 ; i < datamsglength*size ; i++ ) { cout << " " << recvbuf[i] ; } cout << endl ; - cout << "test" << myrank << " sendbuf " << sendbuf << endl ; - MPIAccessDEC->CheckSent() ; +// cout << "test" << myrank << " sendbuf " << sendbuf << endl ; +// MPIAccessDEC->CheckSent() ; int nRecvReq = mpi_access->RecvRequestIdsSize() ; cout << "test" << myrank << " WaitAllRecv " << nRecvReq << " Requests" << endl ; @@ -120,8 +120,8 @@ int main(int argc, char** argv) { cout << endl ; } - cout << "test" << myrank << " final CheckSent" << endl ; - MPIAccessDEC->CheckSent() ; +// cout << "test" << myrank << " final CheckSent" << endl ; +// MPIAccessDEC->CheckSent() ; int nSendReq = mpi_access->SendRequestIdsSize() ; cout << "test" << myrank << " final SendRequestIds " << nSendReq << " SendRequests" diff --git a/src/ParaMEDMEM/test_AllToAllTimeDEC.cxx b/src/ParaMEDMEM/test_AllToAllTimeDEC.cxx index 95c29c5da..f37544289 100644 --- a/src/ParaMEDMEM/test_AllToAllTimeDEC.cxx +++ b/src/ParaMEDMEM/test_AllToAllTimeDEC.cxx @@ -75,6 +75,7 @@ int main(int argc, char** argv) { cout << "test" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test" << myrank << " Barrier done" << endl ; #define maxproc 11 #define maxreq 10000 @@ -198,6 +199,7 @@ int main(int argc, char** argv) { cout << "test" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test" << myrank << " Barrier done" << endl ; delete sourcegroup ; delete targetgroup ; diff --git a/src/ParaMEDMEM/test_AllToAllvDEC.cxx b/src/ParaMEDMEM/test_AllToAllvDEC.cxx index e65df75bb..1145ba029 100644 --- a/src/ParaMEDMEM/test_AllToAllvDEC.cxx +++ b/src/ParaMEDMEM/test_AllToAllvDEC.cxx @@ -98,14 +98,14 @@ int main(int argc, char** argv) { MPIAccessDEC->AllToAllv( sendbuf, sendcounts , sdispls , MPI_INT , recvbuf, recvcounts , rdispls , MPI_INT ) ; - cout << "test" << myrank << " recvbuf before CheckSent" ; + cout << "test" << myrank << " recvbuf " ; for ( i = 0 ; i < datamsglength*size ; i++ ) { cout << " " << recvbuf[i] ; } cout << endl ; - cout << "test" << myrank << " sendbuf " << sendbuf << endl ; - MPIAccessDEC->CheckSent() ; +// cout << "test" << myrank << " sendbuf " << sendbuf << endl ; +// MPIAccessDEC->CheckSent() ; int nRecvReq = mpi_access->RecvRequestIdsSize() ; cout << "test" << myrank << " WaitAllRecv " << nRecvReq << " Requests" << endl ; @@ -122,8 +122,8 @@ int main(int argc, char** argv) { cout << endl ; } - cout << "test" << myrank << " final CheckSent" << endl ; - MPIAccessDEC->CheckSent() ; +// cout << "test" << myrank << " final CheckSent" << endl ; +// MPIAccessDEC->CheckSent() ; int nSendReq = mpi_access->SendRequestIdsSize() ; cout << "test" << myrank << " final SendRequestIds " << nSendReq << " SendRequests" diff --git a/src/ParaMEDMEM/test_AllToAllvTimeDEC.cxx b/src/ParaMEDMEM/test_AllToAllvTimeDEC.cxx index 5f2da5853..682a05f1a 100644 --- a/src/ParaMEDMEM/test_AllToAllvTimeDEC.cxx +++ b/src/ParaMEDMEM/test_AllToAllvTimeDEC.cxx @@ -80,6 +80,7 @@ int main(int argc, char** argv) { cout << "test" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test" << myrank << " Barrier done" << endl ; #define maxproc 11 #define maxreq 1000 @@ -233,6 +234,7 @@ int main(int argc, char** argv) { cout << "test" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test" << myrank << " Barrier done" << endl ; cout << "test" << myrank << " CheckFinalSent" << endl ; sts = MPIAccessDEC->CheckFinalSent() ; @@ -274,6 +276,7 @@ int main(int argc, char** argv) { cout << "test" << myrank << " Barrier :" << endl ; mpi_access->Barrier() ; + cout << "test" << myrank << " Barrier done" << endl ; delete sourcegroup ; delete targetgroup ; -- 2.39.2