OpenMPI does not recognize file system type acronym prefixed to the file name

Author: wkliao

src/dispatchers/file.c

@@ -165,7 +165,7 @@ void set_get_comm_attr(MPI_Comm        comm,
          * pncio_init_keyval is necessary for MPI_Finalize() to free key
          * pncio_node_ids_keyval.
          */
-        MPI_Comm_create_keyval(MPI_NULL_COPY_FN, PNCIO_end_call,
+        MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, PNCIO_end_call,
                                &pncio_init_keyval, (void*)0);
         MPI_Comm_set_attr(MPI_COMM_SELF, pncio_init_keyval, (void*)0);
     }

src/drivers/ncmpio/ncmpio_close.c

@@ -213,7 +213,13 @@ ncmpio_close(void *ncdp)
 #else
             MPI_File fh;
             int mpireturn;
+#ifdef MPICH_VERSION
+            /* MPICH recognizes file system type acronym prefixed to the file name */
             TRACE_IO(MPI_File_open, (MPI_COMM_SELF, ncp->path, MPI_MODE_RDWR, MPI_INFO_NULL, &fh));
+#else
+            char *path = ncmpii_remove_file_system_type_prefix(ncp->path);
+            TRACE_IO(MPI_File_open, (MPI_COMM_SELF, path, MPI_MODE_RDWR, MPI_INFO_NULL, &fh));
+#endif
             if (mpireturn == MPI_SUCCESS) {
                 /* obtain file size */
                 MPI_Offset *file_size;

src/drivers/ncmpio/ncmpio_create.c

@@ -167,7 +167,7 @@ ncmpio_create(MPI_Comm         comm,
 
     /* Extract hints from user_info. Two hints must be extracted now in order
      * to continue:
-     *     pnc_driver: whether to user MPI-IO or PnetCDF's PNCIO driver.
+     *     pnc_driver: whether to use MPI-IO or PnetCDF's PNCIO driver.
      *     nc_num_aggrs_per_node: number of processes per node to be the INA
      *     aggregators.
      *
@@ -274,7 +274,7 @@ if (rank == 0) printf("%s at %d fstype=%s\n", __func__,__LINE__,(ncp->fstype ==
 #ifdef HAVE_UNLINK
                 /* unlink() is likely faster then truncate(). However, unlink()
                  * can be expensive when the file size is large. For example,
-                 * it taook 1.1061 seconds to delete a file of size 27.72 GiB
+                 * it took 1.1061 seconds to delete a file of size 27.72 GiB
                  * on Perlmutter at NERSC.
                  */
                 err = unlink(filename);
@@ -288,7 +288,12 @@ if (rank == 0) printf("%s at %d fstype=%s\n", __func__,__LINE__,(ncp->fstype ==
                 if (ncp->fstype != PNCIO_FSTYPE_MPIIO)
                     err = PNCIO_File_delete(filename);
                 else {
+#ifdef MPICH_VERSION
+                    /* MPICH recognizes file system type acronym prefixed to the file name */
                     TRACE_IO(MPI_File_delete, (path, MPI_INFO_NULL));
+#else
+                    TRACE_IO(MPI_File_delete, (filename, MPI_INFO_NULL));
+#endif
                     if (mpireturn != MPI_SUCCESS) {
                         int errorclass;
                         MPI_Error_class(mpireturn, &errorclass);
@@ -342,7 +347,12 @@ if (rank == 0) printf("%s at %d fstype=%s\n", __func__,__LINE__,(ncp->fstype ==
                     NCI_Free(pncio_fh);
                 }
                 else {
+#ifdef MPICH_VERSION
+                    /* MPICH recognizes file system type acronym prefixed to the file name */
                     TRACE_IO(MPI_File_open, (MPI_COMM_SELF, path, MPI_MODE_RDWR, MPI_INFO_NULL, &fh));
+#else
+                    TRACE_IO(MPI_File_open, (MPI_COMM_SELF, filename, MPI_MODE_RDWR, MPI_INFO_NULL, &fh));
+#endif
                     if (mpireturn != MPI_SUCCESS) {
                         int errorclass;
                         MPI_Error_class(mpireturn, &errorclass);
@@ -537,8 +547,8 @@ if (rank == 0) printf("%s at %d fstype=%s\n", __func__,__LINE__,(ncp->fstype ==
                 if (ncp->rank == 0 &&
                     striping_factor * striping_unit == 0 &&
                     striping_factor + striping_unit > 0) {
-                    /* rank 0 retreives folder's striping settings */
-                    lustre_get_striping(path, &striping_factor, &striping_unit);
+                    /* rank 0 retrieves folder's striping settings */
+                    lustre_get_striping(filename, &striping_factor, &striping_unit);
                     /* error is ignored, if there is any */
                     stripings[0] = striping_factor;
                     stripings[1] = striping_unit;
@@ -558,7 +568,12 @@ if (rank == 0) printf("%s at %d fstype=%s\n", __func__,__LINE__,(ncp->fstype ==
             }
         }
 
+#ifdef MPICH_VERSION
+        /* MPICH recognizes file system type acronym prefixed to the file name */
         TRACE_IO(MPI_File_open, (comm, path, mpiomode, user_info, &fh));
+#else
+        TRACE_IO(MPI_File_open, (comm, filename, mpiomode, user_info, &fh));
+#endif
         if (mpireturn != MPI_SUCCESS) {
 #ifndef HAVE_ACCESS
             if (fIsSet(cmode, NC_NOCLOBBER)) {

src/drivers/ncmpio/ncmpio_file_io.c

@@ -731,15 +731,21 @@ ncmpio_file_delete(NC *ncp)
     int err=NC_NOERR;
 
     if (ncp->rank == 0) {
+        char *path = ncmpii_remove_file_system_type_prefix(ncp->path);
         if (ncp->fstype == PNCIO_FSTYPE_MPIIO) {
             char *mpi_name;
             int mpireturn;
+#ifdef MPICH_VERSION
+            /* MPICH recognizes file system type acronym prefixed to the file name */
             TRACE_IO(MPI_File_delete, ((char *)ncp->path, ncp->mpiinfo));
+#else
+            TRACE_IO(MPI_File_delete, (path, ncp->mpiinfo));
+#endif
             if (mpireturn != MPI_SUCCESS)
                 err = ncmpii_error_mpi2nc(mpireturn, mpi_name);
         }
         else
-            err = PNCIO_File_delete(ncp->path);
+            err = PNCIO_File_delete(path);
     }
 
     if (ncp->nprocs > 1)

src/drivers/ncmpio/ncmpio_file_misc.c

@@ -213,8 +213,15 @@ ncmpio_begin_indep_data(void *ncdp)
     if (ncp->independent_fh == MPI_FILE_NULL) {
         char *mpi_name;
         int mpireturn;
+#ifdef MPICH_VERSION
+        /* MPICH recognizes file system type acronym prefixed to the file name */
         TRACE_IO(MPI_File_open, (MPI_COMM_SELF, ncp->path, ncp->mpiomode,
                                  ncp->mpiinfo, &ncp->independent_fh));
+#else
+        char *path = ncmpii_remove_file_system_type_prefix(ncp->path);
+        TRACE_IO(MPI_File_open, (MPI_COMM_SELF, path, ncp->mpiomode,
+                                 ncp->mpiinfo, &ncp->independent_fh));
+#endif
         if (mpireturn != MPI_SUCCESS)
             return ncmpii_error_mpi2nc(mpireturn, mpi_name);
 

src/drivers/ncmpio/ncmpio_open.c

@@ -204,7 +204,12 @@ if (rank == 0) printf("%s at %d fstype=%s\n", __func__,__LINE__,(ncp->fstype ==
 
     /* open file collectively ---------------------------------------------- */
     if (ncp->fstype == PNCIO_FSTYPE_MPIIO) {
+#ifdef MPICH_VERSION
+        /* MPICH recognizes file system type acronym prefixed to the file name */
         TRACE_IO(MPI_File_open, (comm, path, mpiomode, user_info, &fh));
+#else
+        TRACE_IO(MPI_File_open, (comm, filename, mpiomode, user_info, &fh));
+#endif
         if (mpireturn != MPI_SUCCESS) {
             err = ncmpii_error_mpi2nc(mpireturn, mpi_name);
             DEBUG_FOPEN_ERROR(err);

test/testcases/file_create_open.c

@@ -63,6 +63,8 @@ int test_io(const char *out_path,
     err = file_op(out_path, info_dup);
     if (err != 0) nerrs++;
 
+#ifdef MPICH_VERSION
+    /* MPICH recognizes file system type acronym prefixed to the file name */
     if (strncmp("ufs:", out_path, 4)) {
         char *prefix_fname;
         prefix_fname = (char*) malloc(strlen(out_path) + 10);
@@ -73,6 +75,7 @@ int test_io(const char *out_path,
 
         free(prefix_fname);
     }
+#endif
 
     if (info != MPI_INFO_NULL) MPI_Info_free(&info_dup);