From 982f266a73ecce897a2c8964e669da248a0a8e22 Mon Sep 17 00:00:00 2001 From: Rob Latham Date: Thu, 17 Nov 2016 14:34:49 -0600 Subject: [PATCH 1/2] clean up hints in HDF5 error cases --- src/aiori-HDF5.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/aiori-HDF5.c b/src/aiori-HDF5.c index 5c0f139..ffcda2a 100755 --- a/src/aiori-HDF5.c +++ b/src/aiori-HDF5.c @@ -260,6 +260,8 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param) HDF5_CHECK(H5Fget_vfd_handle (*fd, apl, (void **)&fd_mpiio), "cannot get MPIIO file handle"); + if (mpiHintsCheck != MPI_INFO_NULL) + MPI_Info_free(&mpiHintsCheck); MPI_CHECK(MPI_File_get_info (*fd_mpiio, &mpiHintsCheck), "cannot get info object through MPIIO"); @@ -267,6 +269,8 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param) "\nhints returned from opened file (MPIIO) {\n"); ShowHints(&mpiHintsCheck); fprintf(stdout, "}\n"); + if (mpiHintsCheck != MPI_INFO_NULL) + MPI_Info_free(&mpiHintsCheck); } } MPI_CHECK(MPI_Barrier(testComm), "barrier error"); @@ -328,6 +332,8 @@ static void *HDF5_Open(char *testFileName, IOR_param_t * param) and shape of data set, and open it for access */ dataSpace = H5Screate_simple(NUM_DIMS, dataSetDims, NULL); HDF5_CHECK(dataSpace, "cannot create simple data space"); + if (mpiHints != MPI_INFO_NULL) + MPI_Info_free(&mpiHints); return (fd); } From 6b782226c7e604ee027edd52f231cd853cb200c4 Mon Sep 17 00:00:00 2001 From: Rob Latham Date: Tue, 28 Aug 2018 14:29:36 -0500 Subject: [PATCH 2/2] fix pnetcdf build issues It does not look like anyone has built the pnetcdf driver in a long time --- src/aiori-NCMPI.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aiori-NCMPI.c b/src/aiori-NCMPI.c index 42ee19e..e7d8e35 100755 --- a/src/aiori-NCMPI.c +++ b/src/aiori-NCMPI.c @@ -53,7 +53,7 @@ static IOR_offset_t NCMPI_Xfer(int, void *, IOR_size_t *, IOR_offset_t, IOR_param_t *); static void NCMPI_Close(void *, IOR_param_t *); static void NCMPI_Delete(char *, IOR_param_t *); -static void NCMPI_SetVersion(IOR_param_t *); +static char *NCMPI_GetVersion(IOR_param_t *); static void NCMPI_Fsync(void *, IOR_param_t *); static IOR_offset_t NCMPI_GetFileSize(IOR_param_t *, MPI_Comm, char *); static int NCMPI_Access(const char *, int, IOR_param_t *); @@ -175,7 +175,7 @@ static void *NCMPI_Open(char *testFileName, IOR_param_t * param) static IOR_offset_t NCMPI_Xfer(int access, void *fd, IOR_size_t * buffer, IOR_offset_t length, IOR_param_t * param) { - char *bufferPtr = (char *)buffer; + signed char *bufferPtr = (signed char *)buffer; static int firstReadCheck = FALSE, startDataSet; int var_id, dim_id[NUM_DIMS]; MPI_Offset bufSize[NUM_DIMS], offset[NUM_DIMS]; @@ -343,7 +343,7 @@ static void NCMPI_Delete(char *testFileName, IOR_param_t * param) */ static char* NCMPI_GetVersion() { - return ncmpi_inq_libvers(); + return (char *)ncmpi_inq_libvers(); } /*