From fd3a5f4fdb7a42be0ad0a4195cc72ec60daeba42 Mon Sep 17 00:00:00 2001 From: Aditya Trivedi Date: Fri, 11 Apr 2025 17:48:43 +0530 Subject: [PATCH] Remove get_c_op_from_fortran Auxiliary function --- src/mpi.f90 | 4 +++- src/mpi_c_bindings.f90 | 2 +- src/mpi_wrapper.c | 8 -------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/mpi.f90 b/src/mpi.f90 index 7a6bed4..22b1851 100644 --- a/src/mpi.f90 +++ b/src/mpi.f90 @@ -3,7 +3,9 @@ module mpi #ifdef OPEN_MPI #define MPI_HANDLE_KIND 8 +#define MPI_SUM_value 3 #else +#define MPI_SUM_value 1476395011 #define MPI_HANDLE_KIND 4 #endif @@ -20,7 +22,7 @@ module mpi integer, parameter :: MPI_COMM_WORLD = -1000 real(8), parameter :: MPI_IN_PLACE = -1002 - integer, parameter :: MPI_SUM = -2300 + integer, parameter :: MPI_SUM = MPI_SUM_value integer, parameter :: MPI_INFO_NULL = -2000 integer, parameter :: MPI_STATUS_SIZE = 5 integer :: MPI_STATUS_IGNORE = 0 diff --git a/src/mpi_c_bindings.f90 b/src/mpi_c_bindings.f90 index 2c0fa2f..47654b2 100644 --- a/src/mpi_c_bindings.f90 +++ b/src/mpi_c_bindings.f90 @@ -55,7 +55,7 @@ function c_mpi_datatype_f2c(datatype) bind(C, name="get_c_datatype_from_fortran" integer(kind=MPI_HANDLE_KIND) :: c_mpi_datatype_f2c end function c_mpi_datatype_f2c - function c_mpi_op_f2c(op_f) bind(C, name="get_c_op_from_fortran") + function c_mpi_op_f2c(op_f) bind(C, name="MPI_Op_f2c") use iso_c_binding, only: c_ptr, c_int integer(c_int), value :: op_f integer(kind=MPI_HANDLE_KIND) :: c_mpi_op_f2c diff --git a/src/mpi_wrapper.c b/src/mpi_wrapper.c index d37b6cb..d2e9c1f 100644 --- a/src/mpi_wrapper.c +++ b/src/mpi_wrapper.c @@ -37,14 +37,6 @@ MPI_Info get_c_MPI_INFO_NULL() { return MPI_INFO_NULL; } -MPI_Op get_c_op_from_fortran(int op) { - if (op == FORTRAN_MPI_SUM) { - return MPI_SUM; - } else { - return MPI_Op_f2c(op); - } -} - MPI_Comm get_c_MPI_COMM_WORLD() { return MPI_COMM_WORLD; }