update stat arg for apple (#3726)

* update stat arg for apple * use H5_HAVE_DARWIN for Apple ifdef * fix typo * removed duplicate H5_ih_info_t * added fortran async test to cmake
HDFGroup · Oct 23, 2023 · 34f4569 · 34f4569
1 parent a4c318d
commit 34f4569
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
@@ -72,12 +72,6 @@ END FUNCTION h5fis_accessible
      INTEGER(HSIZE_T) :: tot_space !< Amount of free space in the file
   END TYPE H5F_info_free_t
 
-!> @brief H5_ih_info_t derived type.
-  TYPE, BIND(C) :: H5_ih_info_t
-     INTEGER(HSIZE_T) :: index_size !< btree and/or list
-     INTEGER(HSIZE_T) :: heap_size  !< Heap size
-  END TYPE H5_ih_info_t
-
 !> @brief H5F_info_t_sohm derived type.
   TYPE, BIND(C) :: H5F_info_sohm_t
         INTEGER(C_INT)     :: version  !< Version # of shared object header info

diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90
@@ -110,12 +110,6 @@ MODULE H5O
      TYPE(mesg_t)   :: mesg
   END TYPE c_hdr_t
 
-!> @brief Extra metadata storage for obj & attributes
-  TYPE, BIND(C) :: H5_ih_info_t
-     INTEGER(hsize_t) :: index_size !<  btree and/or list
-     INTEGER(hsize_t) :: heap_size  !<  heap
-  END TYPE H5_ih_info_t
-
 !> @brief meta_size_t derived type
   TYPE, BIND(C) :: meta_size_t
      TYPE(H5_ih_info_t) :: obj  !<  v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets

diff --git a/fortran/src/H5config_f.inc.cmake b/fortran/src/H5config_f.inc.cmake
@@ -23,6 +23,12 @@
 #undef H5_HAVE_SUBFILING_VFD
 #endif
 
+! Define if on APPLE
+#cmakedefine01 H5_HAVE_DARWIN
+#if H5_HAVE_DARWIN == 0
+#undef H5_HAVE_DARWIN
+#endif
+
 ! Define if the intrinsic function STORAGE_SIZE exists
 #define H5_FORTRAN_HAVE_STORAGE_SIZE @H5_FORTRAN_HAVE_STORAGE_SIZE@
 
@@ -81,4 +87,4 @@
 #cmakedefine01 H5_NO_DEPRECATED_SYMBOLS
 #if H5_NO_DEPRECATED_SYMBOLS == 0
 #undef H5_NO_DEPRECATED_SYMBOLS
-#endif
+#endif
diff --git a/fortran/src/H5config_f.inc.in b/fortran/src/H5config_f.inc.in
@@ -20,6 +20,9 @@
 ! Define if we have subfiling support
 #undef HAVE_SUBFILING_VFD
 
+! Define if on APPLE
+#undef HAVE_DARWIN
+
 ! Define if the intrinsic function STORAGE_SIZE exists
 #undef FORTRAN_HAVE_STORAGE_SIZE
 

diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
@@ -25,6 +25,12 @@ MODULE H5GLOBAL
 
   IMPLICIT NONE
 
+!> @brief H5_ih_info_t derived type.
+  TYPE, BIND(C) :: H5_ih_info_t
+     INTEGER(HSIZE_T) :: index_size !< btree and/or list
+     INTEGER(HSIZE_T) :: heap_size  !< Heap size
+  END TYPE H5_ih_info_t
+
 !> \addtogroup FH5
 !> @{
   ! Parameters used in the function 'h5kind_to_type' located in H5_ff.F90.

diff --git a/fortran/testpar/CMakeTests.cmake b/fortran/testpar/CMakeTests.cmake
@@ -17,3 +17,4 @@
 ##############################################################################
 add_test (NAME MPI_TEST_FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS})
 add_test (NAME MPI_TEST_FORT_subfiling_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:subfiling_test> ${MPIEXEC_POSTFLAGS})
+add_test (NAME MPI_TEST_FORT_async_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:async_test> ${MPIEXEC_POSTFLAGS})
diff --git a/fortran/testpar/subfiling.F90 b/fortran/testpar/subfiling.F90
@@ -54,6 +54,7 @@ PROGRAM subfiling_test
   INTEGER(HID_T) :: driver_id
 
   CHARACTER(len=8) :: hex1, hex2
+  CHARACTER(len=1) :: arg
 
   !
   ! initialize MPI
@@ -336,10 +337,14 @@ PROGRAM subfiling_test
         WRITE(*,"(A,A)") "Failed to find the stub subfile ",TRIM(filename)
         nerrors = nerrors + 1
      ENDIF
-
-     CALL EXECUTE_COMMAND_LINE("stat --format='%i' "//filename//" >> tmp_inode", EXITSTAT=i)
+#ifdef H5_HAVE_DARWIN
+     arg(1:1)="f"
+#else
+     arg(1:1)="c"
+#endif
+     CALL EXECUTE_COMMAND_LINE("stat -"//arg(1:1)//" %i "//filename//" >> tmp_inode", EXITSTAT=i)
      IF(i.ne.0)THEN
-        WRITE(*,"(A,A)") "Failed to stat the stub  subfile ",TRIM(filename)
+        WRITE(*,"(A,A)") "Failed to stat the stub subfile ",TRIM(filename)
         nerrors = nerrors + 1
      ENDIF