From 35b7a4e5a28da7f0080c96b0edeb71508a933f33 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 18 Dec 2023 13:32:46 -0600 Subject: [PATCH 1/9] added tests --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index d2587e04d76..f9c4bc4c0f1 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -348,9 +348,10 @@ if (H5EX_BUILD_TESTING) ADD_H5_CMP_TEST (h5ex_g_corder) ADD_H5_CMP_TEST (h5ex_g_phase) # if (HDF_ENABLE_F2003) -# ADD_H5_CMP_TEST (h5ex_g_iterate_F03) -# ADD_H5_CMP_TEST (h5ex_g_traverse_F03) -# ADD_H5_CMP_TEST (h5ex_g_visit_F03) + ADD_H5_CMP_TEST (h5ex_g_intermediate) + ADD_H5_CMP_TEST (h5ex_g_iterate) + ADD_H5_CMP_TEST (h5ex_g_traverse) + ADD_H5_CMP_TEST (h5ex_g_visit) # endif () endif () From 85e2c062436cfbb8974623c7193bf5a7e2ee88f3 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 19 Dec 2023 09:17:06 -0600 Subject: [PATCH 2/9] fixes --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 8 +++++--- HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake | 1 + HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt | 5 ++--- HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 | 3 +-- configure.ac | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 73cf14587dc..4a84b914ddf 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -322,12 +322,14 @@ if (H5EX_BUILD_TESTING) endmacro () macro (ADD_H5_CMP_TEST testname) + MESSAGE(status "LDKJFLDKJF ${testname}") add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname}-clearall COMMAND ${CMAKE_COMMAND} -E remove ${testname}.out.tmp ) + MESSAGE(status "HERE ${testname}") add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname} COMMAND "${CMAKE_COMMAND}" @@ -348,9 +350,9 @@ if (H5EX_BUILD_TESTING) ADD_H5_CMP_TEST (h5ex_g_corder) ADD_H5_CMP_TEST (h5ex_g_phase) # if (HDF_ENABLE_F2003) - ADD_H5_CMP_TEST (h5ex_g_intermediate) - ADD_H5_CMP_TEST (h5ex_g_iterate) - ADD_H5_CMP_TEST (h5ex_g_traverse) +# ADD_H5_CMP_TEST (h5ex_g_intermediate) +# ADD_H5_CMP_TEST (h5ex_g_iterate) +# ADD_H5_CMP_TEST (h5ex_g_traverse) ADD_H5_CMP_TEST (h5ex_g_visit) # endif () diff --git a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake index fa38fe6d36d..272e5988946 100644 --- a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake +++ b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake @@ -8,6 +8,7 @@ set (common_examples h5ex_g_corder h5ex_g_phase h5ex_g_create + h5ex_g_visit_F03 ) #set (f03_examples diff --git a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt index 792caaf0bf6..80db7d6e8e4 100644 --- a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt @@ -66,11 +66,10 @@ if (H5EX_BUILD_TESTING) # Ensure that 24 is a multiple of the number of processes. # The number 24 corresponds to SPACE1_DIM1 and SPACE1_DIM2 defined in ph5example.c math(EXPR NUMPROCS "24 / ((24 + ${MPIEXEC_MAX_NUMPROCS} - 1) / ${MPIEXEC_MAX_NUMPROCS})") - foreach (example_name ${examples}) - if (${example_name} STREQUAL "ph5_hyperslab_by_col") + if (${example_name} STREQUAL "ph5_f90_hyperslab_by_row") ADD_GREP_TEST (${example_name} 2) - elseif (${example_name} STREQUAL "ph5_hyperslab_by_chunk" OR ${example_name} STREQUAL "ph5_hyperslab_by_pattern") + elseif (${example_name} STREQUAL "ph5_f90_hyperslab_by_chunk" OR ${example_name} STREQUAL "ph5_f90_hyperslab_by_pattern") ADD_GREP_TEST (${example_name} 4) else () ADD_GREP_TEST (${example_name} ${NUMPROCS}) diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 index 3a707afea3e..c4e6cce6c8f 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 @@ -20,8 +20,7 @@ PROGRAM DATASET_BY_CHUNK INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/4,8/) ! Dataset dimensions ! in the file. -! INTEGER, DIMENSION(7) :: dimsfi = (/4,8,0,0,0,0,0/) - INTEGER(HSIZE_T), DIMENSION (2) :: dimsfi = (/4,8/) + INTEGER(HSIZE_T), DIMENSION(2) :: dimsfi = (/4,8/) INTEGER(HSIZE_T), DIMENSION(2) :: chunk_dims = (/2,4/) ! Chunks dimensions INTEGER(HSIZE_T), DIMENSION(2) :: count diff --git a/configure.ac b/configure.ac index 689ab3d2a42..17d0e1e2362 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.71]) +AC_PREREQ([2.69]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file From 4cade2135ea632c89a22130360fa4823d73dd4c9 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Tue, 19 Dec 2023 17:39:58 -0600 Subject: [PATCH 3/9] updated files --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 20 +++++++++----- .../FORTRAN/H5G/Fortran_sourcefiles.cmake | 26 ++++++++++++++----- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 4a84b914ddf..bae4d34161e 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -349,11 +349,19 @@ if (H5EX_BUILD_TESTING) ADD_DUMP_TEST (h5ex_g_create) ADD_H5_CMP_TEST (h5ex_g_corder) ADD_H5_CMP_TEST (h5ex_g_phase) -# if (HDF_ENABLE_F2003) -# ADD_H5_CMP_TEST (h5ex_g_intermediate) -# ADD_H5_CMP_TEST (h5ex_g_iterate) -# ADD_H5_CMP_TEST (h5ex_g_traverse) - ADD_H5_CMP_TEST (h5ex_g_visit) -# endif () + + if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") + ADD_H5_CMP_TEST (h5ex_g_intermediate) + ADD_H5_CMP_TEST (h5ex_g_iterate) + ADD_H5_CMP_TEST (h5ex_g_traverse) + ADD_H5_CMP_TEST (h5ex_g_visit) + else () + if (HDF_ENABLE_F2003) + ADD_H5_CMP_TEST (h5ex_g_intermediate) + ADD_H5_CMP_TEST (h5ex_g_iterate) + ADD_H5_CMP_TEST (h5ex_g_traverse) + ADD_H5_CMP_TEST (h5ex_g_visit) + endif () + endif () endif () diff --git a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake index 272e5988946..bd44ecdcbea 100644 --- a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake +++ b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake @@ -8,11 +8,23 @@ set (common_examples h5ex_g_corder h5ex_g_phase h5ex_g_create - h5ex_g_visit_F03 ) - -#set (f03_examples -# h5ex_g_iterate_F03 -# h5ex_g_traverse_F03 -# h5ex_g_visit_F03 -#) +if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") + set (common_examples + ${common_examples} + h5ex_g_intermediate + h5ex_g_iterate + h5ex_g_traverse + h5ex_g_visit + ) +else () + if (HDF_ENABLE_F2003) + set (common_examples + ${common_examples} + h5ex_g_intermediate + h5ex_g_iterate + h5ex_g_traverse + h5ex_g_visit + ) + endif () +endif () From c1b7dba76d596de0277c076ae58d44e5d4fba2f3 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 20 Dec 2023 11:06:31 -0600 Subject: [PATCH 4/9] added more tests --- HDF5Examples/CMakeLists.txt | 1 + HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 28 ++++++++++++------------- configure.ac | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/HDF5Examples/CMakeLists.txt b/HDF5Examples/CMakeLists.txt index e944b9efee4..37c54a3346f 100644 --- a/HDF5Examples/CMakeLists.txt +++ b/HDF5Examples/CMakeLists.txt @@ -143,6 +143,7 @@ if (${H5_LIBVER_DIR} GREATER 16) endif () configure_file (${HDF5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5D/h5_version.h @ONLY) + configure_file (${HDF5EX_F90_SRC_DIR}/H5G/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY) else () set (HDF_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) endif () diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index bae4d34161e..112f67f2d9d 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -173,19 +173,19 @@ endif () if (H5EX_BUILD_TESTING) # if (HDF_ENABLE_F2003) -# set (exfiles -# h5ex_g_iterate -# h5ex_g_traverse -# h5ex_g_visit -# ) -# foreach (example ${exfiles}) -# add_custom_command ( -# TARGET ${EXAMPLE_VARNAME}_f90_${example} -# POST_BUILD -# COMMAND ${CMAKE_COMMAND} -# ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/${example}.h5 ${PROJECT_BINARY_DIR}/${example}.h5 -# ) -# endforeach () + set (exfiles + h5ex_g_iterate + h5ex_g_traverse + h5ex_g_visit + ) + foreach (example ${exfiles}) + add_custom_command ( + TARGET ${EXAMPLE_VARNAME}_f90_${example} + POST_BUILD + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/${example}.h5 ${PROJECT_BINARY_DIR}/${example}.h5 + ) + endforeach () # endif () macro (ADD_DUMP_TEST testname) @@ -322,14 +322,12 @@ if (H5EX_BUILD_TESTING) endmacro () macro (ADD_H5_CMP_TEST testname) - MESSAGE(status "LDKJFLDKJF ${testname}") add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname}-clearall COMMAND ${CMAKE_COMMAND} -E remove ${testname}.out.tmp ) - MESSAGE(status "HERE ${testname}") add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname} COMMAND "${CMAKE_COMMAND}" diff --git a/configure.ac b/configure.ac index 17d0e1e2362..689ab3d2a42 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.69]) +AC_PREREQ([2.71]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file From 3715772658af666c203b03acc1b64cc9d2b47db9 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 20 Dec 2023 11:43:29 -0600 Subject: [PATCH 5/9] cleanup --- HDF5Examples/FORTRAN/H5G/h5_version.h.in | 23 ++ .../FORTRAN/H5G/h5ex_g_intermediate.F90 | 130 ++++++++++ HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.F90 | 115 +++++++++ HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.h5 | Bin 0 -> 2928 bytes HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 | 240 ++++++++++++++++++ HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.h5 | Bin 0 -> 6312 bytes HDF5Examples/FORTRAN/H5G/h5ex_g_visit.F90 | 158 ++++++++++++ HDF5Examples/FORTRAN/H5G/h5ex_g_visit.h5 | Bin 0 -> 6312 bytes .../H5G/tfiles/18/F03/h5ex_g_iterate_F03.tst | 5 - .../H5G/tfiles/18/F03/h5ex_g_visit_F03.tst | 8 - .../H5G/tfiles/18/h5ex_g_intermediate.tst | 5 + .../FORTRAN/H5G/tfiles/18/h5ex_g_iterate.tst | 5 + .../H5G/tfiles/18/h5ex_g_iterate_F03.tst | 5 - ...g_traverse_F03.tst => h5ex_g_traverse.tst} | 0 .../H5G/tfiles/18/h5ex_g_traverse_F03.tst | 32 --- .../FORTRAN/H5G/tfiles/18/h5ex_g_visit.tst | 19 ++ .../H5G/tfiles/18/h5ex_g_visit_F03.tst | 8 - 17 files changed, 695 insertions(+), 58 deletions(-) create mode 100644 HDF5Examples/FORTRAN/H5G/h5_version.h.in create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_intermediate.F90 create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.F90 create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.h5 create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.h5 create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_visit.F90 create mode 100644 HDF5Examples/FORTRAN/H5G/h5ex_g_visit.h5 delete mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/F03/h5ex_g_iterate_F03.tst delete mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/F03/h5ex_g_visit_F03.tst create mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/h5ex_g_intermediate.tst create mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/h5ex_g_iterate.tst delete mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/h5ex_g_iterate_F03.tst rename HDF5Examples/FORTRAN/H5G/tfiles/18/{F03/h5ex_g_traverse_F03.tst => h5ex_g_traverse.tst} (100%) delete mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/h5ex_g_traverse_F03.tst create mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/h5ex_g_visit.tst delete mode 100644 HDF5Examples/FORTRAN/H5G/tfiles/18/h5ex_g_visit_F03.tst diff --git a/HDF5Examples/FORTRAN/H5G/h5_version.h.in b/HDF5Examples/FORTRAN/H5G/h5_version.h.in new file mode 100644 index 00000000000..68276759df4 --- /dev/null +++ b/HDF5Examples/FORTRAN/H5G/h5_version.h.in @@ -0,0 +1,23 @@ +! Version numbers +! +! For major interface/format changes +! +#define H5_VERS_MAJOR @H5_VERS_MAJOR@ +! +! For minor interface/format changes +! +#define H5_VERS_MINOR @H5_VERS_MINOR@ +! +! For tweaks, bug-fixes, or development +! +#define H5_VERS_RELEASE @H5_VERS_RELEASE@ + +! macros for comparing versions + +#define H5_VERSION_GE(Maj, Min, Rel) \ + (((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR == Min) && (H5_VERS_RELEASE >= Rel)) || \ + ((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR > Min)) || (H5_VERS_MAJOR > Maj)) + +#define H5_VERSION_LE(Maj, Min, Rel) \ + (((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR == Min) && (H5_VERS_RELEASE <= Rel)) || \ + ((H5_VERS_MAJOR == Maj) && (H5_VERS_MINOR < Min)) || (H5_VERS_MAJOR < Maj)) diff --git a/HDF5Examples/FORTRAN/H5G/h5ex_g_intermediate.F90 b/HDF5Examples/FORTRAN/H5G/h5ex_g_intermediate.F90 new file mode 100644 index 00000000000..751b747f843 --- /dev/null +++ b/HDF5Examples/FORTRAN/H5G/h5ex_g_intermediate.F90 @@ -0,0 +1,130 @@ +!************************************************************ +! +! This example shows how to create intermediate groups with +! a single call to H5Gcreate. +! +!************************************************************/ + +MODULE g_intermediate + + USE HDF5 + USE ISO_C_BINDING + IMPLICIT NONE + +CONTAINS + +!************************************************************ +! +! Operator function for H5Ovisit. This function prints the +! name and type of the object passed to it. +! +!************************************************************ + + INTEGER FUNCTION op_func(loc_id, name, info, cptr) bind(C) + + USE HDF5 + USE ISO_C_BINDING + IMPLICIT NONE + + INTEGER(HID_T), VALUE :: loc_id + CHARACTER(LEN=1), DIMENSION(1:50) :: name ! We must have LEN=1 for bind(C) strings + ! in order to be standard compliant + TYPE(H5O_info_t) :: info + CHARACTER(LEN=50) :: name_string = ' ' + TYPE(C_PTR) :: cptr + INTEGER :: i + + DO i = 1, 50 + IF(name(i)(1:1).EQ.C_NULL_CHAR) EXIT ! Read up to the C NULL termination + name_string(i:i) = name(i)(1:1) + ENDDO + + WRITE(*,"('/')",ADVANCE="NO") ! Print root group in object path + ! + ! Check if the current object is the root group, and if not print + ! the full path name and type. + ! + IF(name(1)(1:1) .EQ. '.')THEN ! Root group, do not print '.' + WRITE(*,"(' (Group)')") + ELSE + IF(info%type.EQ.H5O_TYPE_GROUP_F)THEN + WRITE(*,'(A," (Group)")') TRIM(name_string) + ELSE IF(info%type.EQ.H5O_TYPE_DATASET_F)THEN + WRITE(*,'(A," (Dataset)")') TRIM(name_string) + ELSE IF(info%type.EQ.H5O_TYPE_NAMED_DATATYPE_F)THEN + WRITE(*,'(A," (Datatype)")') TRIM(name_string) + ELSE + WRITE(*,'(A," (Unknown)")') TRIM(name_string) + ENDIF + ENDIF + + op_func = 0 ! return successful + + END FUNCTION op_func + +END MODULE g_intermediate + +!************************************************************ +! +! Operator function to be called by H5Ovisit. +! +!************************************************************ +PROGRAM main + + USE HDF5 + USE ISO_C_BINDING + USE g_intermediate + + IMPLICIT NONE + + CHARACTER(LEN=22), PARAMETER :: filename = "h5ex_g_intermediate.h5" + INTEGER(HID_T) :: file + INTEGER(HID_T) :: group + INTEGER(HID_T) :: lcpl + INTEGER :: status + TYPE(C_FUNPTR) :: funptr + TYPE(C_PTR) :: f_ptr + INTEGER :: ret_value + + ! + ! Initialize FORTRAN interface. + ! + CALL H5open_f(status) + + file = H5I_INVALID_HID_F + group = H5I_INVALID_HID_F + lcpl = H5I_INVALID_HID_F + + ! + ! Create a new file using the default properties. + ! + CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file, status) + ! + ! Create link creation property list and set it to allow creation + ! of intermediate groups. + ! + CALL H5Pcreate_f(H5P_LINK_CREATE_F, lcpl, status) + CALL H5Pset_create_inter_group_f(lcpl, 1, status) + ! + ! Create the group /G1/G2/G3. Note that /G1 and /G1/G2 do not + ! exist yet. This call would cause an error if we did not use the + ! previously created property list. + ! + CALL H5Gcreate_f(file, "/G1/G2/G3", group, status, lcpl_id=lcpl) + ! + ! Print all the objects in the files to show that intermediate + ! groups have been created. See h5ex_g_visit_f for more information + ! on how to use H5Ovisit_f. + ! + WRITE(*,'(A)') "Objects in the file:" + funptr = C_FUNLOC(op_func) + f_ptr = C_NULL_PTR + CALL H5Ovisit_f(file, H5_INDEX_NAME_F, H5_ITER_NATIVE_F, funptr, f_ptr, ret_value, status) + ! + ! Close and release resources. + ! + CALL H5Pclose_f(lcpl, status) + CALL H5Gclose_f(group, status) + CALL H5Fclose_f(file, status) + +END PROGRAM main diff --git a/HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.F90 b/HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.F90 new file mode 100644 index 00000000000..ca4346365d6 --- /dev/null +++ b/HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.F90 @@ -0,0 +1,115 @@ +!************************************************************ +! +! This example shows how to iterate over group members using +! H5Literate. +! +!************************************************************ +MODULE g_iterate + + USE HDF5 + USE ISO_C_BINDING + IMPLICIT NONE + +CONTAINS + +!************************************************************ +! +! Operator function. Prints the name and type of the object +! being examined. +! +! ************************************************************ + + INTEGER FUNCTION op_func(loc_id, name, info, operator_data) bind(C) + + USE HDF5 + USE ISO_C_BINDING + IMPLICIT NONE + + INTEGER(HID_T), VALUE :: loc_id + CHARACTER(LEN=1), DIMENSION(1:10) :: name ! must have LEN=1 for bind(C) strings + TYPE(C_PTR) :: info + TYPE(C_PTR) :: operator_data + + INTEGER :: status, i, len + + TYPE(H5O_info_t), TARGET :: infobuf + TYPE(C_PTR) :: ptr + CHARACTER(LEN=10) :: name_string + + ! + ! Get type of the object and display its name and type. + ! The name of the object is passed to this FUNCTION by + ! the Library. + ! + + DO i = 1, 10 + name_string(i:i) = name(i)(1:1) + ENDDO + + CALL H5Oget_info_by_name_f(loc_id, name_string, infobuf, status) + + ! Include the string up to the C NULL CHARACTER + len = 0 + DO + IF(name_string(len+1:len+1).EQ.C_NULL_CHAR.OR.len.GE.10) EXIT + len = len + 1 + ENDDO + + IF(infobuf%type.EQ.H5O_TYPE_GROUP_F)THEN + WRITE(*,*) " Group: ", name_string(1:len) + ELSE IF(infobuf%type.EQ.H5O_TYPE_DATASET_F)THEN + WRITE(*,*) " Dataset: ", name_string(1:len) + ELSE IF(infobuf%type.EQ.H5O_TYPE_NAMED_DATATYPE_F)THEN + WRITE(*,*) " Datatype: ", name_string(1:len) + ELSE + WRITE(*,*) " Unknown: ", name_string(1:len) + ENDIF + + op_func = 0 ! return successful + + END FUNCTION op_func + +END MODULE g_iterate + + +PROGRAM main + + USE HDF5 + USE ISO_C_BINDING + USE g_iterate + + IMPLICIT NONE + + CHARACTER(LEN=17), PARAMETER :: filename = "h5ex_g_iterate.h5" + INTEGER(HID_T) :: file ! Handle + INTEGER :: status + TYPE(C_FUNPTR) :: funptr + TYPE(C_PTR) :: ptr + INTEGER(hsize_t) :: idx + INTEGER :: ret_value + ! + ! Initialize FORTRAN interface. + ! + CALL h5open_f(status) + ! + ! Open file. + ! + CALL H5Fopen_f(filename, H5F_ACC_RDONLY_F, file, status) + ! + ! Begin iteration. + ! + WRITE(*,'(A)') "Objects in root group:" + + idx = 0 + funptr = C_FUNLOC(op_func) ! call back function + ptr = C_NULL_PTR + + CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_NATIVE_F, idx, funptr, ptr, ret_value, status) + + ! + ! Close and release resources. + ! + CALL H5Fclose_f(file, status) + +END PROGRAM main + diff --git a/HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.h5 b/HDF5Examples/FORTRAN/H5G/h5ex_g_iterate.h5 new file mode 100644 index 0000000000000000000000000000000000000000..6576e8f8abb11ebb0a1ba79d452ed10d427a2614 GIT binary patch literal 2928 zcmeHIJ5B>J5PjYa!3siJs1TLQv~YqT?ZOr)L~IU_l9D4tqJbMwQgRt2N{&HEfdo6A zc?6 od + nextod%token = infobuf%token + idx = 0 + ptr2 = C_LOC(nextod%recurs) + funptr = C_FUNLOC(op_func) + CALL h5literate_by_name_f(loc_id, name_string, H5_INDEX_NAME_F, H5_ITER_NATIVE_F, idx, & + funptr, ptr2, ret_val, status) + + ENDIF + WRITE(*,'(A)') space(1:spaces)//"}" + RETURN + ELSE IF(infobuf%type.EQ.H5O_TYPE_DATASET_F)THEN + WRITE(*,'("Dataset: ",A)') name_string(1:len) + ELSE IF(infobuf%type.EQ.H5O_TYPE_NAMED_DATATYPE_F)THEN + WRITE(*,'("Datatype: ",A)') name_string(1:len) + ELSE + WRITE(*,'("Unknown: ",A)') name_string(1:len) + ENDIF + +END FUNCTION op_func + +!************************************************************ +! +! This function recursively searches the linked list of +! opdata structures for one whose address/token matches +! target_token. Returns 1 if a match is found, and 0 +! otherwise. +! +! ************************************************************/ + + INTEGER RECURSIVE FUNCTION group_check(od, target_token) result(g_c) + + IMPLICIT NONE + INTEGER :: i + TYPE(opdata), POINTER :: od +#if H5_VERSION_GE(1, 12, 0) + TYPE(H5O_TOKEN_T_F) :: target_token +#else + INTEGER(haddr_t) :: target_token +#endif + + IF (od%token%token(1) .EQ. target_token%token(1))THEN + g_c = 1 ! Addresses/token match + ELSE IF (od%recurs.EQ.0)THEN + g_c = 0 ! Root group reached with no matches + ELSE + ! Recursively examine the next node + g_c = group_check(od%prev, target_token) + END IF + END FUNCTION group_check + +END MODULE g_traverse + +PROGRAM main + + USE HDF5 + USE ISO_C_BINDING + + USE g_traverse + + IMPLICIT NONE + + INTEGER(hid_t) :: file ! Handle + INTEGER :: status + TYPE(h5o_info_t) :: infobuf + TYPE(opdata), TARGET :: od + TYPE(C_PTR) :: ptr + INTEGER(hsize_t) :: idx + INTEGER :: ret_value + TYPE(C_FUNPTR) :: funptr + ! + ! Initialize FORTRAN interface. + ! + CALL h5open_f(status) + ! + ! Open file and initialize the operator data structure. + ! + CALL H5Fopen_f(filename, H5F_ACC_RDONLY_F, file, status) + + CALL h5oget_info_by_name_f(file, "/", infobuf, status) + + od%recurs = 0 + od%prev => NULL() + od%token = infobuf%token + ! + ! Print the root group and formatting, begin iteration. + ! + idx = 0 + funptr = C_FUNLOC(op_func) + ptr = C_LOC(od) + + WRITE(*,'(A)') "/ {" + CALL H5Literate_f(file, H5_INDEX_NAME_F, H5_ITER_NATIVE_F, idx, funptr, ptr, ret_value, status) + WRITE(*,'(A)') "}" + + ! + ! Close and release resources. + ! + CALL H5Fclose_f(file, status) + +END PROGRAM main + + + diff --git a/HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.h5 b/HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.h5 new file mode 100644 index 0000000000000000000000000000000000000000..3d5d301e25215e2e8a274b106b99fe141e029392 GIT binary patch literal 6312 zcmeHLy-or_5S}{_PXvR+sIj_|690Nkz)&GkAHYH*Mx(@^#FA3qz><q=NtBA zR+P1gidsSJcy7?B6Sdgif4xx0P@g`vKDqo03PedAb0H+-H&?gU<~Z+s{)&5DKa^w@ zQE5e71S*{lV={66aPeraQ=`Xz2ixcS)$Y&z3i%%0e~{lLy|7K&e}+YI6^=Y6jW{9T zx~I5!>B_g(jQQ4G7j(loft<q=NtBA zR+P1gidsSJcy7?B6Sdgif4xx0P@g`vKDqo03PedAb0H+-H&?gU<~Z+s{)&5DKa^w@ zQE5e71S*{lV={66aPeraQ=`Xz2ixcS)$Y&z3i%%0e~{lLy|7K&e}+YI6^=Y6jW{9T zx~I5!>B_g(jQQ4G7j(loft Date: Thu, 21 Dec 2023 12:30:05 -0600 Subject: [PATCH 6/9] updated traverse example --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 4 +++- .../FORTRAN/H5G/Fortran_sourcefiles.cmake | 7 ++++++- HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 | 21 +++++++++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 112f67f2d9d..da79b856d5f 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -351,8 +351,10 @@ if (H5EX_BUILD_TESTING) if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") ADD_H5_CMP_TEST (h5ex_g_intermediate) ADD_H5_CMP_TEST (h5ex_g_iterate) - ADD_H5_CMP_TEST (h5ex_g_traverse) ADD_H5_CMP_TEST (h5ex_g_visit) + if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.14.3") + ADD_H5_CMP_TEST (h5ex_g_traverse) + endif() else () if (HDF_ENABLE_F2003) ADD_H5_CMP_TEST (h5ex_g_intermediate) diff --git a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake index bd44ecdcbea..e2e8e9d42b8 100644 --- a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake +++ b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake @@ -14,9 +14,14 @@ if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") ${common_examples} h5ex_g_intermediate h5ex_g_iterate - h5ex_g_traverse h5ex_g_visit ) + if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.14.3") + set (common_examples + ${common_examples} + h5ex_g_traverse + ) + endif() else () if (HDF_ENABLE_F2003) set (common_examples diff --git a/HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 b/HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 index f7c4d0e2285..198d437003a 100644 --- a/HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 +++ b/HDF5Examples/FORTRAN/H5G/h5ex_g_traverse.F90 @@ -127,7 +127,7 @@ RECURSIVE INTEGER(KIND=C_INT) FUNCTION op_func(loc_id, name, info, operator_data ! H5Odecr_refcount. ! - i = group_check(od, infobuf%token) + i = group_check(loc_id, od, infobuf%token) IF(i.EQ.1)THEN WRITE(*,'(A)') space(1:spaces)//" Warning: Loop detected!" @@ -164,24 +164,33 @@ END FUNCTION op_func ! ! ************************************************************/ - INTEGER RECURSIVE FUNCTION group_check(od, target_token) result(g_c) + INTEGER RECURSIVE FUNCTION group_check(loc_id, od, target_token) result(g_c) IMPLICIT NONE INTEGER :: i TYPE(opdata), POINTER :: od -#if H5_VERSION_GE(1, 12, 0) + INTEGER(HID_T) :: loc_id + INTEGER :: cmp_value +#if H5_VERSION_GE(1, 14, 3) TYPE(H5O_TOKEN_T_F) :: target_token + INTEGER :: status + CALL h5otoken_cmp_f(loc_id, od%token, target_token, cmp_value, status) +#else +#if H5_VERSION_GE(1, 12, 0) +#error "example only supports HDF5 versions < 1.12.0 and > 1.14.2" #else INTEGER(haddr_t) :: target_token + cmp_value = -1 + IF(od%token .EQ. target_token) cmp_value = 0 #endif - - IF (od%token%token(1) .EQ. target_token%token(1))THEN +#endif + IF (cmp_value.EQ.0)THEN g_c = 1 ! Addresses/token match ELSE IF (od%recurs.EQ.0)THEN g_c = 0 ! Root group reached with no matches ELSE ! Recursively examine the next node - g_c = group_check(od%prev, target_token) + g_c = group_check(loc_id, od%prev, target_token) END IF END FUNCTION group_check From 473994dd0088a38abb4174c286d41462b34f72a5 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Thu, 21 Dec 2023 12:23:37 -0700 Subject: [PATCH 7/9] added H5PAR success statement --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 2 -- HDF5Examples/FORTRAN/H5PAR/ph5_f90_dataset.F90 | 1 + HDF5Examples/FORTRAN/H5PAR/ph5_f90_file_create.F90 | 2 +- HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 | 2 +- HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_col.F90 | 2 +- HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_pattern.F90 | 2 +- HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_row.F90 | 3 ++- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 81506d9aa2c..074dacc5ccf 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -172,7 +172,6 @@ endif () #endif () if (H5EX_BUILD_TESTING) -# if (HDF_ENABLE_F2003) set (exfiles h5ex_g_iterate h5ex_g_traverse @@ -186,7 +185,6 @@ if (H5EX_BUILD_TESTING) ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/${example}.h5 ${PROJECT_BINARY_DIR}/${example}.h5 ) endforeach () -# endif () macro (ADD_DUMP_TEST testname) add_test ( diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_dataset.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_dataset.F90 index ce126a34558..9819ab3c739 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_dataset.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_dataset.F90 @@ -101,6 +101,7 @@ PROGRAM DATASET ! Close FORTRAN interface ! CALL h5close_f(error) + IF(mpi_rank.EQ.0) WRITE(*,'(A)') "PHDF5 example finished with no errors" CALL MPI_FINALIZE(mpierror) diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_file_create.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_file_create.F90 index f330d4eb220..7944b5ab39b 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_file_create.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_file_create.F90 @@ -53,7 +53,7 @@ PROGRAM FILE_CREATE ! Close FORTRAN interface ! CALL h5close_f(error) - + IF(mpi_rank.EQ.0) WRITE(*,'(A)') "PHDF5 example finished with no errors" CALL MPI_FINALIZE(mpierror) END PROGRAM FILE_CREATE diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 index c4e6cce6c8f..c74e55dbdcf 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90 @@ -162,7 +162,7 @@ PROGRAM DATASET_BY_CHUNK ! Close FORTRAN interfaces and HDF5 library. ! CALL h5close_f(error) - + IF(mpi_rank.EQ.0) WRITE(*,'(A)') "PHDF5 example finished with no errors" 100 continue CALL MPI_FINALIZE(mpierror) diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_col.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_col.F90 index b7b46e824bb..dc92667c053 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_col.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_col.F90 @@ -127,7 +127,7 @@ PROGRAM DATASET_BY_COL ! Close FORTRAN predefined datatypes. ! CALL h5close_f(error) - + IF(mpi_rank.EQ.0) WRITE(*,'(A)') "PHDF5 example finished with no errors" CALL MPI_FINALIZE(mpierror) END PROGRAM DATASET_BY_COL diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_pattern.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_pattern.F90 index 0f2077f10e9..dd02c634e78 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_pattern.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_pattern.F90 @@ -158,7 +158,7 @@ PROGRAM DATASET_BY_PATTERN ! Close FORTRAN interfaces and HDF5 library. ! CALL h5close_f(error) - + IF(mpi_rank.EQ.0) WRITE(*,'(A)') "PHDF5 example finished with no errors" 100 continue CALL MPI_FINALIZE(mpierror) diff --git a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_row.F90 b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_row.F90 index 398be23a103..f66da2a2f0a 100644 --- a/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_row.F90 +++ b/HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_row.F90 @@ -147,8 +147,9 @@ PROGRAM DATASET_BY_ROW ! Close FORTRAN interfaces and HDF5 library. ! CALL h5close_f(error) - + IF(mpi_rank.EQ.0) WRITE(*,'(A)') "PHDF5 example finished with no errors" 100 continue + CALL MPI_FINALIZE(mpierror) END PROGRAM DATASET_BY_ROW From 5f393cd59773c0de4e063213e3199e91e4bf199b Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 22 Dec 2023 12:11:37 -0600 Subject: [PATCH 8/9] skipping H5_f90_h5ex_g_traverse --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 074dacc5ccf..dc8888a335e 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -350,14 +350,14 @@ if (H5EX_BUILD_TESTING) ADD_H5_CMP_TEST (h5ex_g_intermediate) ADD_H5_CMP_TEST (h5ex_g_iterate) ADD_H5_CMP_TEST (h5ex_g_visit) - if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.14.3") - ADD_H5_CMP_TEST (h5ex_g_traverse) - endif() + #if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.14.3") + #ADD_H5_CMP_TEST (h5ex_g_traverse) + #endif() else () if (HDF_ENABLE_F2003) ADD_H5_CMP_TEST (h5ex_g_intermediate) ADD_H5_CMP_TEST (h5ex_g_iterate) - ADD_H5_CMP_TEST (h5ex_g_traverse) + # ADD_H5_CMP_TEST (h5ex_g_traverse) ADD_H5_CMP_TEST (h5ex_g_visit) endif () endif () From 8622880ec6cf595a5a0d5a0c96226d4baf245971 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 22 Dec 2023 14:33:10 -0700 Subject: [PATCH 9/9] Update CMakeLists.txt --- HDF5Examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HDF5Examples/CMakeLists.txt b/HDF5Examples/CMakeLists.txt index 63adad67c0d..6f8b53c0167 100644 --- a/HDF5Examples/CMakeLists.txt +++ b/HDF5Examples/CMakeLists.txt @@ -159,7 +159,7 @@ if (${H5_LIBVER_DIR} GREATER 16) endif () configure_file (${H5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5D/h5_version.h @ONLY) - configure_file (${H5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY) + configure_file (${H5EX_F90_SRC_DIR}/H5G/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY) else () set (HDF_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) endif ()