Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
brtnfld committed Dec 19, 2023
1 parent 082dd2e commit 85e2c06
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
8 changes: 5 additions & 3 deletions HDF5Examples/FORTRAN/H5G/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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 ()

Expand Down
1 change: 1 addition & 0 deletions HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ set (common_examples
h5ex_g_corder
h5ex_g_phase
h5ex_g_create
h5ex_g_visit_F03
)

#set (f03_examples
Expand Down
5 changes: 2 additions & 3 deletions HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
3 changes: 1 addition & 2 deletions HDF5Examples/FORTRAN/H5PAR/ph5_f90_hyperslab_by_chunk.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 85e2c06

Please sign in to comment.