Changeset 23349

Timestamp:

09/28/18 10:06:27 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: integrating MeDiPack

File:

• issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp (modified) (17 diffs)

issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp

@@ -42 +42 @@
   assert(sendcount==recvcount || sendtype==recvtype); // we handle only identical representations
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Allgather(sendbuf,
                     sendcount,
@@ -76 +76 @@
   assert(sendtype==recvtype); // we handle only identical representations
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Allgatherv(sendbuf,
                      sendcount,
@@ -113 +113 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Allreduce(sendbuf,
                     recvbuf,
@@ -145 +145 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Barrier(comm);
 # else 
@@ -159 +159 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Bcast(buffer, 
                 count,
@@ -181 +181 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   assert(0); // to be implemented
 # else 
@@ -217 +217 @@
         int rc=0;
         #ifdef _HAVE_MPI_
-                #ifdef _HAVE_AMPI_
-                        #ifdef _HAVE_ADJOINTMPI_
+                #if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
+                        #if defined(_HAVE_ADJOINTMPI_)
+                                rc=AMPI_Finalize();
+                        #elif defined(_HAVE_MEDIPACK_)
+                                TOOL::finalize();
                                 rc=AMPI_Finalize();
                         #else
@@ -234 +237 @@
   assert(sendtype==recvtype && sendcnt==recvcnt); // we handle only identical representations
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Gather(sendbuf,
                  sendcnt,
@@ -271 +274 @@
   assert(sendtype==recvtype); // we handle only identical representations
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Gatherv(sendbuf,
                   sendcnt,
@@ -310 +313 @@
         int rc=0;
         #ifdef _HAVE_MPI_
-                #ifdef _HAVE_AMPI_
-                        #ifdef _HAVE_ADJOINTMPI_
+                #if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
+                        #if defined(_HAVE_ADJOINTMPI_)
                                 rc=AMPI_Init(argc,argv);
+                        #elif defined(_HAVE_MEDIPACK_)
+                                rc=AMPI_Init(argc,argv);
+                                TOOL::init();
                         #else
                                 rc=AMPI_Init_NT(argc,argv);
@@ -326 +332 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Recv(buf, 
                count,
@@ -357 +363 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Reduce(sendbuf,
                  recvbuf,
@@ -392 +398 @@
   assert(sendtype==recvtype && sendcnt==recvcnt); // we handle only identical representations
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Scatter(sendbuf,
                   sendcnt,
@@ -429 +435 @@
   assert(sendtype==recvtype); // we handle only identical representations
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Scatterv(sendbuf,
                    sendcnts,
@@ -468 +474 @@
   int rc=0;
 #ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
   rc=AMPI_Send(buf, 
                count,
@@ -512 +518 @@
 int rc=0;
 #ifdef _HAVE_MPI_
-#ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
 rc=MPI_Comm_split(comm, color, key, newcomm);
 #else
@@ -526 +532 @@
         int rc=0;
 #ifdef _HAVE_MPI_
-#ifdef _HAVE_AMPI_
+#if defined(_HAVE_AMPI_) &&  !defined(_WRAPPERS_)
         rc=MPI_Intercomm_create(comm,local_leader,peer_comm,remote_leader,tag,newintercomm);
 #else