mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes for tools and skip autotools tests for no filter

Browse Source
This commit is contained in:
Allen Byrne 2020-01-29 15:39:25 -06:00
parent 1eb6a4512b
commit c5e2d97573
4 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
java/examples/datasets/JavaDatasetExample.sh.in
View File

@ -324,16 +324,18 @@ else
nerrors="`expr $nerrors + 1`" nerrors="`expr $nerrors + 1`"
fi fi
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip" if test $USE_FILTER_DEFLATE = "yes"; then
TESTING examples.datasets.H5Ex_D_Gzip echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip"
( TESTING examples.datasets.H5Ex_D_Gzip
$RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip > H5Ex_D_Gzip.out (
) $RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Gzip > H5Ex_D_Gzip.out
if diff H5Ex_D_Gzip.out examples.datasets.H5Ex_D_Gzip.txt > /dev/null; then )
echo " PASSED datasets.H5Ex_D_Gzip" if diff H5Ex_D_Gzip.out examples.datasets.H5Ex_D_Gzip.txt > /dev/null; then
else echo " PASSED datasets.H5Ex_D_Gzip"
echo "**FAILED** datasets.H5Ex_D_Gzip" else
nerrors="`expr $nerrors + 1`" echo "**FAILED** datasets.H5Ex_D_Gzip"
nerrors="`expr $nerrors + 1`"
fi
fi fi
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Hyperslab" echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Hyperslab"
@ -360,16 +362,18 @@ else
nerrors="`expr $nerrors + 1`" nerrors="`expr $nerrors + 1`"
fi fi
echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle" if test $USE_FILTER_DEFLATE = "yes"; then
TESTING examples.datasets.H5Ex_D_Shuffle echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle"
( TESTING examples.datasets.H5Ex_D_Shuffle
$RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle > H5Ex_D_Shuffle.out (
) $RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH examples.datasets.H5Ex_D_Shuffle > H5Ex_D_Shuffle.out
if diff H5Ex_D_Shuffle.out examples.datasets.H5Ex_D_Shuffle.txt > /dev/null; then )
echo " PASSED datasets.H5Ex_D_Shuffle" if diff H5Ex_D_Shuffle.out examples.datasets.H5Ex_D_Shuffle.txt > /dev/null; then
else echo " PASSED datasets.H5Ex_D_Shuffle"
echo "**FAILED** datasets.H5Ex_D_Shuffle" else
nerrors="`expr $nerrors + 1`" echo "**FAILED** datasets.H5Ex_D_Shuffle"
nerrors="`expr $nerrors + 1`"
fi
fi fi
if test $USE_FILTER_SZIP = "yes"; then if test $USE_FILTER_SZIP = "yes"; then

8
tools/lib/h5diff_array.c
View File

@ -371,9 +371,7 @@ hsize_t diff_array(void *_mem1, void *_mem2, hsize_t nelmts, hsize_t hyper_start
} /* i */ } /* i */
close_member_types(&members); close_member_types(&members);
} /* switch */ } /* switch */
H5TOOLS_DEBUG("diff_array finish:%d - errstat:%d", nfound, opts->err_stat); H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
H5TOOLS_ENDDEBUG(": %d", nfound);
return nfound; return nfound;
} }
@ -2216,9 +2214,7 @@ diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t idx, int rank,
done: done:
opts->err_stat = opts->err_stat | ret_value; opts->err_stat = opts->err_stat | ret_value;
H5TOOLS_DEBUG("diff_datum finish:%d - errstat:%d", nfound, opts->err_stat); H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
H5TOOLS_ENDDEBUG("");
return nfound; return nfound;
} }

1
tools/lib/h5diff_attr.c
View File

@ -152,7 +152,6 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
unsigned i; unsigned i;
herr_t ret_value = SUCCEED; herr_t ret_value = SUCCEED;
H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat); H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
if(H5Oget_info3(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) { if(H5Oget_info3(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) {

4
tools/src/h5diff/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if (NOT ONLY_SHARED_LIBS)
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
) )
target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
#target_compile_definitions(h5diff PRIVATE H5_TOOLS_DEBUG) #target_compile_definitions (h5diff PRIVATE H5_TOOLS_DEBUG)
TARGET_C_PROPERTIES (h5diff STATIC) TARGET_C_PROPERTIES (h5diff STATIC)
target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
set_target_properties (h5diff PROPERTIES FOLDER tools) set_target_properties (h5diff PROPERTIES FOLDER tools)
@ -24,7 +24,7 @@ if (BUILD_SHARED_LIBS)
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
) )
target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
#target_compile_definitions(h5diff-shared PRIVATE H5_TOOLS_DEBUG) #target_compile_definitions (h5diff-shared PRIVATE H5_TOOLS_DEBUG)
TARGET_C_PROPERTIES (h5diff-shared SHARED) TARGET_C_PROPERTIES (h5diff-shared SHARED)
target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
set_target_properties (h5diff-shared PROPERTIES FOLDER tools) set_target_properties (h5diff-shared PROPERTIES FOLDER tools)