Skip to content

Commit

Permalink
Renamed h5fuse.sh to h5fuse (#3834)
Browse files Browse the repository at this point in the history
* provide an alternative to mapfile for older bash
  • Loading branch information
brtnfld authored Nov 7, 2023
1 parent 3c07147 commit ec695cf
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions testpar/t_subfiling_vfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion utils/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions utils/subfiling_vfd/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down

0 comments on commit ec695cf

Please sign in to comment.