ajout de la fonction MPI_Iscatter pour l'interposition Fortran et légère modification pour éviter une erreur

Author: wailbald

src/interpolf.c

@@ -286,10 +286,10 @@ static void MPI_Recv_fortran_wrapper(MPI_Fint *buf, MPI_Fint *count, MPI_Fint *d
     #if (!defined(MPICH_HAS_C2F) && defined(MPICH_NAME) && (MPICH_NAME == 1)) /* MPICH test */
         _wrap_py_return_val = PMPI_Recv((void*)buf, *count, (MPI_Datatype)(*datatype), *source, *tag, (MPI_Comm)(*comm), (MPI_Status*)status);
     #else /* MPI-2 safe call */
-        //MPI_Status temp_status;
+        MPI_Status temp_status;
         //MPI_Status_f2c(status, &temp_status);
         _wrap_py_return_val = PMPI_Recv((void*)buf, *count, MPI_Type_f2c(*datatype), *source, *tag, MPI_Comm_f2c(*comm), (MPI_Status*)status);
-        //MPI_Status_c2f(&temp_status, status);
+        MPI_Status_c2f(&temp_status, status);
     #endif /* MPICH test */
 
     Tsc const duration = rdtsc() - tsc;
@@ -575,8 +575,8 @@ static void MPI_Test_fortran_wrapper(MPI_Fint *request, MPI_Fint *flag, MPI_Fint
         MPI_Request temp_request;
         MPI_Status temp_status;
         temp_request = MPI_Request_f2c(*request);
-        MPI_Status_f2c(status, &temp_status);
-        _wrap_py_return_val = PMPI_Test(&temp_request, (int*)flag, &temp_status);
+        //MPI_Status_f2c(status, &temp_status);
+        _wrap_py_return_val = PMPI_Test(&temp_request, (int*)flag, (MPI_Status*)status);
         *request = MPI_Request_c2f(temp_request);
         MPI_Status_c2f(&temp_status, status);
     #endif /* MPICH test */
@@ -626,6 +626,7 @@ _EXTERN_C_ void mpi_test__(MPI_Fint *request, MPI_Fint *flag, MPI_Fint *status,
 static void MPI_Wait_fortran_wrapper(MPI_Fint *request, MPI_Fint *status, MPI_Fint *ierr) { 
     int _wrap_py_return_val = 0;
 
+    MpiReq const req = *request;
     Tsc const tsc = rdtsc();
 
     #if (!defined(MPICH_HAS_C2F) && defined(MPICH_NAME) && (MPICH_NAME == 1)) /* MPICH test */
@@ -634,7 +635,7 @@ static void MPI_Wait_fortran_wrapper(MPI_Fint *request, MPI_Fint *status, MPI_Fi
         MPI_Request temp_request;
         MPI_Status temp_status;
         temp_request = MPI_Request_f2c(*request);
-        MPI_Status_f2c(status, &temp_status);
+        //MPI_Status_f2c(status, &temp_status);
         _wrap_py_return_val = PMPI_Wait(&temp_request, &temp_status);
         *request = MPI_Request_c2f(temp_request);
         MPI_Status_c2f(&temp_status, status);
@@ -652,7 +653,7 @@ static void MPI_Wait_fortran_wrapper(MPI_Fint *request, MPI_Fint *status, MPI_Fi
         .nb_bytes_s = 0,
         .nb_bytes_r = 0,
         .comm = -1,
-        .req = *request,
+        .req = req,
         .tag = -1,
         .required_thread_lvl = -1,
         .provided_thread_lvl = -1,
@@ -798,4 +799,64 @@ _EXTERN_C_ void mpi_igather_(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *s
 
 _EXTERN_C_ void mpi_igather__(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { 
     MPI_Igather_fortran_wrapper(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, ierr);
+}
+
+
+static void MPI_Iscatter_fortran_wrapper(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { 
+    int _wrap_py_return_val = 0;
+
+    Tsc const tsc = rdtsc();
+
+    #if (!defined(MPICH_HAS_C2F) && defined(MPICH_NAME) && (MPICH_NAME == 1)) /* MPICH test */
+        _wrap_py_return_val = MPI_Iscatter((const void*)sendbuf, *sendcount, (MPI_Datatype)(*sendtype), (void*)recvbuf, *recvcount, (MPI_Datatype)(*recvtype), *root, (MPI_Comm)(*comm), (MPI_Request*)request);
+    #else /* MPI-2 safe call */
+        MPI_Request temp_request;
+        temp_request = MPI_Request_f2c(*request);
+        _wrap_py_return_val = PMPI_Iscatter((const void*)sendbuf, *sendcount, MPI_Type_f2c(*sendtype), (void*)recvbuf, *recvcount, MPI_Type_f2c(*recvtype), *root, MPI_Comm_f2c(*comm), &temp_request);
+        *request = MPI_Request_c2f(temp_request);
+    #endif /* MPICH test */
+
+    Tsc const duration = rdtsc() - tsc;
+
+    int nb_bytes_send, nb_bytes_recv;
+    PMPI_Type_size(MPI_Type_f2c(*sendtype), &nb_bytes_send);
+    PMPI_Type_size(MPI_Type_f2c(*recvtype), &nb_bytes_recv);
+
+    MpiCall const iscatter = {
+        .kind = Iscatter,
+        .time = -1.0,
+        .tsc = tsc,
+        .duration = duration,
+        .current_rank = current_rank,
+        .partner_rank = *root,
+        .nb_bytes_s = nb_bytes_send * (*sendcount),
+        .nb_bytes_r = nb_bytes_recv * (*recvcount),
+        .comm = PMPI_Comm_c2f((MPI_Comm)comm),
+        .req = *request,
+        .tag = -1,
+        .required_thread_lvl = -1,
+        .provided_thread_lvl = -1,
+        .op_type = -1,
+        .finished = false,
+    };
+
+    register_mpi_call(iscatter);
+
+    *ierr = _wrap_py_return_val;
+}
+
+_EXTERN_C_ void MPI_ISCATTER(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { 
+    MPI_Iscatter_fortran_wrapper(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, ierr);
+}
+
+_EXTERN_C_ void mpi_iscatter(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { 
+    MPI_Iscatter_fortran_wrapper(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, ierr);
+}
+
+_EXTERN_C_ void mpi_iscatter_(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { 
+    MPI_Iscatter_fortran_wrapper(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, ierr);
+}
+
+_EXTERN_C_ void mpi_iscatter__(MPI_Fint *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, MPI_Fint *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr) { 
+    MPI_Iscatter_fortran_wrapper(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request, ierr);
 }