mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed h5fuse.sh to h5fuse (#3834)

Browse Source 
* provide an alternative to mapfile for older bash
This commit is contained in:
Scot Breitenfeld
2023-11-07 09:50:03 -06:00
committed by GitHub
parent 3c07147971
commit ec695cf34f
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2 -2
View File
@@ -4236,10 +4236,10 @@ AC_CONFIG_FILES([Makefile
hl/fortran/examples/Makefile
hl/fortran/examples/run-hlfortran-ex.sh])
AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse.sh], [chmod +x utils/subfiling_vfd/h5fuse.sh])
AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse], [chmod +x utils/subfiling_vfd/h5fuse])
if test -n "$TESTPARALLEL"; then
if test "X$SUBFILING_VFD" = "Xyes"; then
AC_CONFIG_LINKS([testpar/h5fuse.sh:utils/subfiling_vfd/h5fuse.sh])
AC_CONFIG_LINKS([testpar/h5fuse:utils/subfiling_vfd/h5fuse])
fi
fi
release_docs/RELEASE.txt
+6
View File
@@ -920,6 +920,12 @@ Bug Fixes since HDF5-1.14.0 release
Tools
-----
- Renamed h5fuse.sh to h5fuse
Addresses Discussion #3791
- Fixed an issue with unmatched MPI messages in ph5diff
The "manager" MPI rank in ph5diff was unintentionally sending "program end"
testpar/t_subfiling_vfd.c
+2 -2
View File
@@ -1898,7 +1898,7 @@ test_subfiling_h5fuse(void)
if (MAINPROCESS) {
FILE *h5fuse_script;
h5fuse_script = fopen("h5fuse.sh", "r");
h5fuse_script = fopen("h5fuse", "r");
if (h5fuse_script)
fclose(h5fuse_script);
else
@@ -2014,7 +2014,7 @@ test_subfiling_h5fuse(void)
SUBF_FILENAME, file_inode);
args[0] = strdup("env");
args[1] = strdup("./h5fuse.sh");
args[1] = strdup("./h5fuse");
args[2] = strdup("-q");
args[3] = strdup("-f");
args[4] = tmp_filename;
utils/Makefile.am
+1 -1
View File
@@ -41,6 +41,6 @@ endif
# All subdirectories
SUBDIRS=$(MIRROR_VFD_DIR) $(TESTUTIL_DIR) $(TOOLS_DIR)
bin_SCRIPTS = subfiling_vfd/h5fuse.sh
bin_SCRIPTS = subfiling_vfd/h5fuse
include $(top_srcdir)/config/conclude.am
utils/subfiling_vfd/CMakeLists.txt
+4 -4
View File
@@ -1,20 +1,20 @@
cmake_minimum_required (VERSION 3.18)
project (HDF5_UTILS_SUBFILINGVFD C)
configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh @ONLY)
configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse @ONLY)
# Copy h5fuse.sh to testpar directory for subfiling tests
# Copy h5fuse to testpar directory for subfiling tests
if (HDF5_ENABLE_PARALLEL AND HDF5_TEST_PARALLEL)
file (
COPY
${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh
${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse
DESTINATION
${HDF5_TEST_PAR_BINARY_DIR}
)
endif ()
install (
FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh
FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse
DESTINATION ${HDF5_INSTALL_BIN_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT utilsapplications
utils/subfiling_vfd/h5fuse.sh.in → utils/subfiling_vfd/h5fuse.in
+2 -2
View File
@@ -26,11 +26,11 @@ function usage {
configuration file either as a command-line argument or the script will
search for the *.config file in the current directory."
echo ""
echo "usage: h5fuse.sh [-f filename] [-h] [-p] [-q] [-r] [-v] "
echo "usage: h5fuse [-f filename] [-h] [-p] [-q] [-r] [-v] "
echo "-f filename Subfile configuration file."
echo "-h Print this help."
echo "-q Quiet all output. [no]"
echo "-p h5fuse.sh is being run in parallel, with more than one rank. [no]"
echo "-p h5fuse is being run in parallel, with more than one rank. [no]"
echo "-r Remove subfiles after being processed. [no]"
echo "-v Verbose output. [no]"
echo ""