Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds link to h5fuse.sh in testpar for autotools #3557

Merged
merged 7 commits into from
Sep 22, 2023
Merged

Adds link to h5fuse.sh in testpar for autotools #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1cb46d
Make the h5fuse.sh utility available to parallel subfiling tests so h…
brtnfld Sep 20, 2023
91c77d0
enable building subfiling with building parallel
brtnfld Sep 20, 2023
82bc749
rm dup.
brtnfld Sep 20, 2023
2ab0710
addressed unused variable
brtnfld Sep 20, 2023
4d0a544
addressed unused variable
brtnfld Sep 20, 2023
6996e7d
remove adding actions for subfiling with Nvidia
brtnfld Sep 20, 2023
ff7da74
warning clean-up: replaced assert with GOTO_ERROR
brtnfld Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux-nvhpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
export OMPI_FC=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/bin/nvfortran
export LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/cuda/12.2/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/lib
export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/comm_libs/openmpi4/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/23.7/compilers/bin:$PATH
cmake -B build -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_BUILD_FORTRAN:BOOL=ON
cmake -B build -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_BUILD_FORTRAN:BOOL=ON
cat build/CMakeCache.txt
cmake --build build
ctest --test-dir build --output-on-failure
2 changes: 2 additions & 0 deletions .github/workflows/main-auto-par.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
--with-default-api-version=v114 \
--enable-shared \
--enable-parallel \
--enable-subfiling-vfd \
--disable-cxx \
--disable-fortran \
--disable-java \
Expand Down Expand Up @@ -111,6 +112,7 @@ jobs:
--with-default-api-version=v114 \
--enable-shared \
--enable-parallel \
--enable-subfiling-vfd \
--disable-cxx \
--disable-fortran \
--disable-java \
Expand Down
5 changes: 5 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4206,6 +4206,11 @@ AC_CONFIG_FILES([Makefile
hl/fortran/examples/run-hlfortran-ex.sh])

AC_CONFIG_FILES([utils/subfiling_vfd/h5fuse.sh], [chmod +x utils/subfiling_vfd/h5fuse.sh])
if test -n "$TESTPARALLEL"; then
if test "X$SUBFILING_VFD" = "Xyes"; then
AC_CONFIG_LINKS([testpar/h5fuse.sh:utils/subfiling_vfd/h5fuse.sh])
fi
fi

AC_CONFIG_COMMANDS([.classes], [], [$MKDIR_P java/src/.classes;
$MKDIR_P java/test/.classes;
Expand Down
3 changes: 3 additions & 0 deletions src/H5FDsubfiling/H5FDioc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */

#define CANBE_UNUSED(X) (void)(X)

/* The driver identification number, initialized at runtime */
static hid_t H5FD_IOC_g = H5I_INVALID_HID;

Expand Down Expand Up @@ -1223,6 +1225,7 @@ H5FD__ioc_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
H5FD_IOC_LOG_CALL(__func__);

assert(file && file->pub.cls);
CANBE_UNUSED(file);
assert(buf);

/* Check for overflow conditions */
Expand Down
1 change: 1 addition & 0 deletions src/H5FDsubfiling/H5FDsubfile_int.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_eof_ptr)

assert(ioc_rank >= 0);
assert(ioc_rank < n_io_concentrators);
CANBE_UNUSED(ioc_rank);
assert(sf_eofs[i] == -1);

sf_eofs[i] = recv_msg[(3 * i) + 1];
Expand Down
2 changes: 2 additions & 0 deletions src/H5FDsubfiling/H5FDsubfiling_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@ H5_DLL herr_t H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_e
}
#endif

#define CANBE_UNUSED(X) (void)(X)

#endif /* H5FDsubfiling_priv_H */
3 changes: 2 additions & 1 deletion src/H5FDsubfiling/H5subfiling_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,8 @@ init_app_layout(sf_topology_t *app_topology, MPI_Comm comm, MPI_Comm node_comm)
if (app_layout->layout[i].node_local_rank == 0)
app_layout->node_count++;

assert(app_layout->node_count > 0);
if (app_layout->node_count <= 0)
H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "node count less than or equal to zero");

if (NULL ==
(app_layout->node_ranks = malloc((size_t)app_layout->node_count * sizeof(*app_layout->node_ranks))))
Expand Down