mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gnu-flags-work

Browse Source
This commit is contained in:
Dana Robinson 2019-07-13 13:09:28 -07:00
commit 9a221fd979
4 changed files with 24 additions and 17 deletions

9
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

4
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 */

24
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)

4
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} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS})
if (UNIX)
add_test (NAME MPI_TEST_PERFORM_perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:perf> ${MPIEXEC_POSTFLAGS})
endif ()
add_test (NAME MPI_TEST_PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf> ${MPIEXEC_POSTFLAGS})