From 33e9b4526ec7b5d910bda879ac92dc992672057b Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 11 Jul 2019 08:31:02 -0500 Subject: [PATCH 1/4] Use H5DOpen2 in hl/test/test_dset_append.c. --- hl/test/test_dset_append.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c index 9d466b594e..8bb4f84bef 100644 --- a/hl/test/test_dset_append.c +++ b/hl/test/test_dset_append.c @@ -691,7 +691,7 @@ test_dataset_append_BUG1(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DBUGNAME1, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DBUGNAME1, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ @@ -853,7 +853,7 @@ test_dataset_append_BUG2(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DBUGNAME2, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DBUGNAME2, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ From 9655485f6af87e8ee221c824f649fa013fad4542 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 11 Jul 2019 10:19:24 -0500 Subject: [PATCH 2/4] non-windows test must be skipped on windows --- tools/test/perform/CMakeTests.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake index 45f43b48de..20e7f59bd2 100644 --- a/tools/test/perform/CMakeTests.cmake +++ b/tools/test/perform/CMakeTests.cmake @@ -170,7 +170,9 @@ endif () set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects") if (H5_HAVE_PARALLEL) - add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) + if (UNIX) + add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) + endif () add_test (NAME MPI_TEST_PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) From 6333fb8711adc3af930e186dad3b8b756e41a863 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 11 Jul 2019 16:24:47 -0500 Subject: [PATCH 3/4] Fix packaging issue --- fortran/src/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 774ed8c3a4..315dc85d01 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -356,8 +356,13 @@ install ( ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h - ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h - ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90 + if (NOT ONLY_SHARED_LIBS) + ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h + ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90 + else () + ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h + ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90 + endif () DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT From 3566fff6261d0bb8e360d3842e99919d2eb4ba73 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 11 Jul 2019 16:08:35 -0700 Subject: [PATCH 4/4] Reverted snprintf to sprintf in the multi VFD since the former causes problems on Windows. --- src/H5FDmulti.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index acd128cbbb..800869d0c9 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1966,30 +1966,30 @@ compute_next(H5FD_multi_t *file) static int open_members(H5FD_multi_t *file) { - char tmp[H5FD_MULT_MAX_FILE_NAME_LEN]; - int nerrors=0; + char tmp[H5FD_MULT_MAX_FILE_NAME_LEN]; + int nerrors = 0; static const char *func="(H5FD_multi)open_members"; /* Function Name for error reporting */ /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); UNIQUE_MEMBERS(file->fa.memb_map, mt) { - if(file->memb[mt]) + if(file->memb[mt]) continue; /*already open*/ - assert(file->fa.memb_name[mt]); + assert(file->fa.memb_name[mt]); /* Note: This truncates the user's filename down to only sizeof(tmp) * characters. -QK & JK, 2013/01/17 */ - snprintf(tmp, sizeof(tmp), file->fa.memb_name[mt], file->name); + sprintf(tmp, file->fa.memb_name[mt], file->name); tmp[sizeof(tmp) - 1] = '\0'; - H5E_BEGIN_TRY { - file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF); - } H5E_END_TRY; - if(!file->memb[mt]) { - if(!file->fa.relax || (file->flags & H5F_ACC_RDWR)) - nerrors++; - } + H5E_BEGIN_TRY { + file->memb[mt] = H5FDopen(tmp, file->flags, file->fa.memb_fapl[mt], HADDR_UNDEF); + } H5E_END_TRY; + if(!file->memb[mt]) { + if(!file->fa.relax || (file->flags & H5F_ACC_RDWR)) + nerrors++; + } } END_MEMBERS; if (nerrors) H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error opening member files", -1)