mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

Browse Source 
* commit '6b670e353c1ea7f13ef72cc4297d9973102078bb':
  Correct assignment
  Fix java include, h5watch and remove clang tool.
  Add missing filenames
This commit is contained in:
Allen Byrne 2019-12-11 08:29:33 -06:00
commit 51e7995513
4 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MANIFEST
View File

@ -1344,6 +1344,7 @@
./testpar/t_prestart.c
./testpar/t_span_tree.c
./testpar/t_init_term.c
./testpar/t_2Gio.c
./testpar/testpar.h
./testpar/testpflush.sh.in
./testpar/testphdf5.c
@ -2650,8 +2651,8 @@
./tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
./tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
./tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
./tools/test/h5repack/testfiles/attrregion.tattrreg.h5
./tools/test/h5repack/testfiles/dataregion.tdatareg.h5
./tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl
./tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl
# jam utility and tests
./tools/src/h5jam/Makefile.am

18
config/toolchain/clang.cmake
View File

@ -7,23 +7,5 @@ set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
find_program(
CLANG_TIDY_EXE
NAMES "clang-tidy"
DOC "Path to clang-tidy executable"
)
set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_EXE}" -checks=*,clang-analyzer-*,-clang-analyzer-cplusplus*,-readability-*,-google*)
set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXE}" -checks=*,clang-analyzer-*,-clang-analyzer-cplusplus*,-readability-*,-google*)
#find_program(
# CLANG_FORMAT_EXE
# NAMES "clang-format"
# DOC "Path to clang-format executable"
#)
#
#set(CMAKE_C_CLANG_FORMAT "${CLANG_FORMAT_EXE}")
#set(CMAKE_CXX_CLANG_FORMAT "${CLANG_FORMAT_EXE}")
# the following is used if cross-compiling
set(CMAKE_CROSSCOMPILING_EMULATOR "")

21
hl/tools/h5watch/h5watch.c
View File

@ -132,22 +132,23 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
HDmemset(&ctx, 0, sizeof(ctx));
/* Subsetting information for the tools library printing routines */
ctx.sset->start.data = ss_start;
ctx.sset->stride.data = ss_stride;
ctx.sset->block.data = ss_block;
ctx.sset->count.data = ss_count;
subset.start.data = ss_start;
subset.stride.data = ss_stride;
subset.block.data = ss_block;
subset.count.data = ss_count;
/* Initialize subsetting information */
for(i = 0; i < rank; i++) {
ctx.sset->stride.data[i] = 1;
ctx.sset->count.data[i] = 1;
ctx.sset->start.data[i] = start[i];
ctx.sset->block.data[i] = block[i];
subset.stride.data[i] = 1;
subset.count.data[i] = 1;
subset.start.data[i] = start[i];
subset.block.data[i] = block[i];
} /* end for */
HDmemset(&ctx, 0, sizeof(ctx));
ctx.sset = &subset;
/* Set to all default values and then override */
HDmemset(&info, 0, sizeof info);

2
java/src/jni/CMakeLists.txt
View File

@ -77,7 +77,7 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
########### JNI libraries always must be built shared ###############
add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JAVA_JNI_CHDRS})
target_include_directories (${HDF5_JAVA_JNI_LIB_TARGET}
PRIVATE "${HDF5_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
)
TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED)
target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})