From f22f538ab7fd41a1ea27a78995afb8ebb7035d4e Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 8 Mar 2024 12:57:05 -0600 Subject: [PATCH 1/3] fixes compilation failures due to H5E additions (#4090) --- fortran/src/H5Eff.F90 | 2 +- fortran/test/tH5E_F03.F90 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90 index a95028fe0e6..9ea28079451 100644 --- a/fortran/src/H5Eff.F90 +++ b/fortran/src/H5Eff.F90 @@ -712,7 +712,7 @@ INTEGER(C_INT) FUNCTION H5Ewalk(err_stack, direction, op, op_data) & END FUNCTION H5Ewalk END INTERFACE - hdferr = INT(H5Ewalk(err_stack, direction, op, op_data)) + hdferr = INT(H5Ewalk(err_stack, INT(direction, C_INT), op, op_data)) END SUBROUTINE h5ewalk_f diff --git a/fortran/test/tH5E_F03.F90 b/fortran/test/tH5E_F03.F90 index f5ed9fbc8c2..86e77ecc2bb 100644 --- a/fortran/test/tH5E_F03.F90 +++ b/fortran/test/tH5E_F03.F90 @@ -201,10 +201,10 @@ SUBROUTINE test_error(total_error) ! ** SET THE CUSTOMIZED PRINTING OF ERROR STACK ** ! set the customized error handling routine - func = c_funloc(my_hdf5_error_handler) + func = C_FUNLOC(my_hdf5_error_handler) ! set the data sent to the customized routine - f_ptr = c_loc(my_hdf5_error_handler_data) + f_ptr = C_LOC(my_hdf5_error_handler_data) CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr) CALL check("H5Eset_auto_f", error, total_error) @@ -280,8 +280,8 @@ SUBROUTINE test_error_stack(total_error) func = "FUNC"//C_NULL_CHAR line = 99 - ptr1 = C_LOC(file) - ptr2 = C_LOC(func) + ptr1 = C_LOC(file(1:1)) + ptr2 = C_LOC(func(1:1)) ptr3 = C_LOC(line) CALL h5ecreate_stack_f(estack_id, error) From 56ea1b50f0c8429cc118add2a339bb72a338962f Mon Sep 17 00:00:00 2001 From: "H. Joe Lee" Date: Fri, 8 Mar 2024 14:55:03 -0600 Subject: [PATCH 2/3] Remove extra whitespaces from nvhpc-cmake action. (#4091) --- .github/workflows/nvhpc-cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nvhpc-cmake.yml b/.github/workflows/nvhpc-cmake.yml index 17d6ec6b19d..3a78c0610a0 100644 --- a/.github/workflows/nvhpc-cmake.yml +++ b/.github/workflows/nvhpc-cmake.yml @@ -28,7 +28,7 @@ jobs: - name: Install NVHPC shell: bash - run: | + run: | curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list sudo apt-get update -y From 3ea50208f99ea17de3200d03f3843fcc8a112c34 Mon Sep 17 00:00:00 2001 From: Dana Robinson <43805+derobins@users.noreply.github.com> Date: Fri, 8 Mar 2024 12:55:16 -0800 Subject: [PATCH 3/3] Remove printf debugging in H5I package (#4088) --- config/cmake/HDFCompilerFlags.cmake | 1 - configure.ac | 4 ++-- src/H5Iint.c | 18 ------------------ 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 4116a67cb05..8f9e2a18fcc 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -375,7 +375,6 @@ if (HDF5_ENABLE_DEBUG_APIS) H5D_DEBUG H5D_CHUNK_DEBUG H5F_DEBUG - H5I_DEBUG H5MM_DEBUG H5O_DEBUG H5S_DEBUG diff --git a/configure.ac b/configure.ac index 26c7681d917..30962b1adcf 100644 --- a/configure.ac +++ b/configure.ac @@ -2572,8 +2572,8 @@ AC_SUBST([INTERNAL_DEBUG_OUTPUT]) ## too specialized or have huge performance hits. These ## are not listed in the "all" packages list. ## -## all_packages="AC,B,B2,D,F,FA,FL,FS,I,MM,O,S,T,Z" -all_packages="AC,B2,CX,D,F,I,MM,O,S,T,Z" +## all_packages="AC,B,B2,D,F,FA,FL,FS,MM,O,S,T,Z" +all_packages="AC,B2,CX,D,F,MM,O,S,T,Z" case "X-$INTERNAL_DEBUG_OUTPUT" in X-yes|X-all) diff --git a/src/H5Iint.c b/src/H5Iint.c index 1c5321461cc..fe3b90c2454 100644 --- a/src/H5Iint.c +++ b/src/H5Iint.c @@ -373,15 +373,6 @@ H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata) /* Discard the future object */ if ((info->discard_cb)(info->u.object) < 0) { if (udata->force) { -#ifdef H5I_DEBUG - if (H5DEBUG(I)) { - fprintf(H5DEBUG(I), - "H5I: discard type=%d obj=%p " - "failure ignored\n", - (int)udata->type_info->cls->type, info->u.c_object); - } -#endif /* H5I_DEBUG */ - /* Indicate node should be removed from list */ mark = true; } @@ -396,15 +387,6 @@ H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata) if (udata->type_info->cls->free_func && (udata->type_info->cls->free_func)(info->u.object, H5_REQUEST_NULL) < 0) { if (udata->force) { -#ifdef H5I_DEBUG - if (H5DEBUG(I)) { - fprintf(H5DEBUG(I), - "H5I: free type=%d obj=%p " - "failure ignored\n", - (int)udata->type_info->cls->type, info->u.c_object); - } -#endif /* H5I_DEBUG */ - /* Indicate node should be removed from list */ mark = true; }