Merge pull request #795 from wangvsa/fortran-mpi-wrapper

Fortram mpi wrappers have wrong parameter types
LLNL · Sep 1, 2023 · cc63788 · cc63788
2 parents 35f5136 + 1feb044
commit cc63788
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/src/pmpi_wrappers.c b/client/src/pmpi_wrappers.c
@@ -74,11 +74,11 @@ int MPI_Init_thread(int* argc, char*** argv, int required, int* provided)
  return unifyfs_mpi_init(argc, argv, required, provided);
 }
 
-void mpi_init_thread_(int required, int* provided, MPI_Fint* ierr)
+void mpi_init_thread_(MPI_Fint* required, MPI_Fint* provided, MPI_Fint* ierr)
 {
  int argc = 0;
  char** argv = NULL;
- int rc = unifyfs_mpi_init(&argc, &argv, required, provided);
+ int rc = unifyfs_mpi_init(&argc, &argv, *((int*)required), provided);
 
  if (NULL != ierr) {
  *ierr = (MPI_Fint)rc;

diff --git a/client/src/pmpi_wrappers.h b/client/src/pmpi_wrappers.h
@@ -22,7 +22,7 @@ int unifyfs_mpi_init(int* argc, char*** argv, int required, int* provided);
 int MPI_Init(int* argc, char*** argv);
 int MPI_Init_thread(int* argc, char*** argv, int required, int* provided);
 void mpi_init_(MPI_Fint* ierr);
-void mpi_init_thread_(int required, int* provided, MPI_Fint* ierr);
+void mpi_init_thread_(MPI_Fint* required, MPI_Fint* provided, MPI_Fint* ierr);
 
 /* MPI_Finalize PMPI wrapper */
 int unifyfs_mpi_finalize(void);