Merge branch 'mkitti/hdf5-cross-macos-aarch64' into mkitti/hdf5-cross

eschnett · Apr 18, 2023 · c229edc · c229edc
2 parents 0d7a697 + 5d21231
commit c229edc
Show file tree

Hide file tree

Showing 7 changed files with 138 additions and 1,941 deletions.
diff --git a/H/HDF5/bundled/files/darwin-arm64v8/H5LTff_gen.F90 b/H/HDF5/bundled/files/darwin-arm64v8/H5LTff_gen.F90
diff --git a/H/HDF5/bundled/files/darwin-arm64v8/H5TBff_gen.F90 b/H/HDF5/bundled/files/darwin-arm64v8/H5TBff_gen.F90
@@ -34,31 +34,26 @@ MODULE H5TB
   INTERFACE h5tbwrite_field_name_f
      MODULE PROCEDURE h5tbwrite_field_name_kind_4_rank_1
      MODULE PROCEDURE h5tbwrite_field_name_kind_8_rank_1
-     MODULE PROCEDURE h5tbwrite_field_name_kind_10_rank_1
      MODULE PROCEDURE h5tbwrite_field_name_kind_16_rank_1
   END INTERFACE
   INTERFACE h5tbread_field_name_f
      MODULE PROCEDURE h5tbread_field_name_kind_4_rank_1
      MODULE PROCEDURE h5tbread_field_name_kind_8_rank_1
-     MODULE PROCEDURE h5tbread_field_name_kind_10_rank_1
      MODULE PROCEDURE h5tbread_field_name_kind_16_rank_1
   END INTERFACE
   INTERFACE h5tbwrite_field_index_f
      MODULE PROCEDURE h5tbwrite_field_index_kind_4_rank_1
      MODULE PROCEDURE h5tbwrite_field_index_kind_8_rank_1
-     MODULE PROCEDURE h5tbwrite_field_index_kind_10_rank_1
      MODULE PROCEDURE h5tbwrite_field_index_kind_16_rank_1
   END INTERFACE
   INTERFACE h5tbread_field_index_f
      MODULE PROCEDURE h5tbread_field_index_kind_4_rank_1
      MODULE PROCEDURE h5tbread_field_index_kind_8_rank_1
-     MODULE PROCEDURE h5tbread_field_index_kind_10_rank_1
      MODULE PROCEDURE h5tbread_field_index_kind_16_rank_1
   END INTERFACE
   INTERFACE h5tbinsert_field_f
      MODULE PROCEDURE h5tbinsert_field_kind_4_rank_1
      MODULE PROCEDURE h5tbinsert_field_kind_8_rank_1
-     MODULE PROCEDURE h5tbinsert_field_kind_10_rank_1
      MODULE PROCEDURE h5tbinsert_field_kind_16_rank_1
   END INTERFACE
 CONTAINS
@@ -105,27 +100,6 @@ SUBROUTINE h5tbwrite_field_name_kind_8_rank_1(loc_id,dset_name,field_name,start,
     errcode = h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,start,nrecords,type_size,f_ptr)
   END SUBROUTINE h5tbwrite_field_name_kind_8_rank_1
 !DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_name_kind_10_rank_1
-!DEC$endif
-  SUBROUTINE h5tbwrite_field_name_kind_10_rank_1(loc_id,dset_name,field_name,start, nrecords,type_size,buf,errcode)
-    IMPLICIT NONE
-    INTEGER(hid_t)  , INTENT(IN) :: loc_id
-    CHARACTER(LEN=*), INTENT(IN) :: dset_name
-    CHARACTER(LEN=*), INTENT(in) :: field_name
-    INTEGER(hsize_t), INTENT(in) :: start
-    INTEGER(hsize_t), INTENT(in) :: nrecords
-    INTEGER(size_t),  INTENT(in) :: type_size
-    REAL(KIND=10),INTENT(IN), DIMENSION(*), TARGET :: buf
-    INTEGER :: errcode 
-    INTEGER(size_t) :: namelen
-    INTEGER(size_t) :: namelen1
-    TYPE(C_PTR) :: f_ptr
-    f_ptr = C_LOC(buf(1)            )
-    namelen = LEN(dset_name)
-    namelen1 = LEN(field_name)
-    errcode = h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,start,nrecords,type_size,f_ptr)
-  END SUBROUTINE h5tbwrite_field_name_kind_10_rank_1
-!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_name_kind_16_rank_1
 !DEC$endif
   SUBROUTINE h5tbwrite_field_name_kind_16_rank_1(loc_id,dset_name,field_name,start, nrecords,type_size,buf,errcode)
@@ -189,27 +163,6 @@ SUBROUTINE h5tbread_field_name_kind_8_rank_1(loc_id,dset_name,field_name,start,
     errcode = h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,start,nrecords,type_size,f_ptr)
   END SUBROUTINE h5tbread_field_name_kind_8_rank_1
 !DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_name_kind_10_rank_1
-!DEC$endif
-  SUBROUTINE h5tbread_field_name_kind_10_rank_1(loc_id,dset_name,field_name,start, nrecords,type_size,buf,errcode)
-    IMPLICIT NONE
-    INTEGER(hid_t)  , INTENT(IN) :: loc_id
-    CHARACTER(LEN=*), INTENT(IN) :: dset_name
-    CHARACTER(LEN=*), INTENT(in) :: field_name
-    INTEGER(hsize_t), INTENT(in) :: start
-    INTEGER(hsize_t), INTENT(in) :: nrecords
-    INTEGER(size_t),  INTENT(in) :: type_size
-    REAL(KIND=10),INTENT(INOUT), DIMENSION(*), TARGET :: buf
-    INTEGER :: errcode 
-    INTEGER(size_t) :: namelen
-    INTEGER(size_t) :: namelen1
-    TYPE(C_PTR) :: f_ptr
-    f_ptr = C_LOC(buf(1)            )
-    namelen = LEN(dset_name)
-    namelen1 = LEN(field_name)
-    errcode = h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,start,nrecords,type_size,f_ptr)
-  END SUBROUTINE h5tbread_field_name_kind_10_rank_1
-!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_name_kind_16_rank_1
 !DEC$endif
   SUBROUTINE h5tbread_field_name_kind_16_rank_1(loc_id,dset_name,field_name,start, nrecords,type_size,buf,errcode)
@@ -269,25 +222,6 @@ SUBROUTINE h5tbwrite_field_index_kind_8_rank_1(loc_id,dset_name,field_index,star
     errcode = h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,start,nrecords,type_size,f_ptr)
   END SUBROUTINE h5tbwrite_field_index_kind_8_rank_1
 !DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbwrite_field_index_kind_10_rank_1
-!DEC$endif
-  SUBROUTINE h5tbwrite_field_index_kind_10_rank_1(loc_id,dset_name,field_index,start, nrecords,type_size,buf,errcode)
-    IMPLICIT NONE
-    INTEGER(hid_t)  , INTENT(IN) :: loc_id
-    CHARACTER(LEN=*), INTENT(IN) :: dset_name
-    INTEGER, INTENT(in) :: field_index
-    INTEGER(hsize_t), INTENT(in) :: start
-    INTEGER(hsize_t), INTENT(in) :: nrecords
-    INTEGER(size_t),  INTENT(in) :: type_size
-    REAL(KIND=10),INTENT(IN), DIMENSION(*), TARGET :: buf
-    INTEGER :: errcode 
-    INTEGER(size_t) :: namelen
-    TYPE(C_PTR) :: f_ptr
-    f_ptr = C_LOC(buf(1)            )
-    namelen = LEN(dset_name)
-    errcode = h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,start,nrecords,type_size,f_ptr)
-  END SUBROUTINE h5tbwrite_field_index_kind_10_rank_1
-!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_index_kind_16_rank_1
 !DEC$endif
   SUBROUTINE h5tbwrite_field_index_kind_16_rank_1(loc_id,dset_name,field_index,start, nrecords,type_size,buf,errcode)
@@ -345,25 +279,6 @@ SUBROUTINE h5tbread_field_index_kind_8_rank_1(loc_id,dset_name,field_index,start
     errcode = h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,start,nrecords,type_size,f_ptr)
   END SUBROUTINE h5tbread_field_index_kind_8_rank_1
 !DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbread_field_index_kind_10_rank_1
-!DEC$endif
-  SUBROUTINE h5tbread_field_index_kind_10_rank_1(loc_id,dset_name,field_index,start, nrecords,type_size,buf,errcode)
-    IMPLICIT NONE
-    INTEGER(hid_t)  , INTENT(IN) :: loc_id
-    CHARACTER(LEN=*), INTENT(IN) :: dset_name
-    INTEGER, INTENT(in) :: field_index
-    INTEGER(hsize_t), INTENT(in) :: start
-    INTEGER(hsize_t), INTENT(in) :: nrecords
-    INTEGER(size_t),  INTENT(in) :: type_size
-    REAL(KIND=10),INTENT(INOUT), DIMENSION(*), TARGET :: buf
-    INTEGER :: errcode 
-    INTEGER(size_t) :: namelen
-    TYPE(C_PTR) :: f_ptr
-    f_ptr = C_LOC(buf(1)            )
-    namelen = LEN(dset_name)
-    errcode = h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,start,nrecords,type_size,f_ptr)
-  END SUBROUTINE h5tbread_field_index_kind_10_rank_1
-!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_index_kind_16_rank_1
 !DEC$endif
   SUBROUTINE h5tbread_field_index_kind_16_rank_1(loc_id,dset_name,field_index,start, nrecords,type_size,buf,errcode)
@@ -423,26 +338,6 @@ SUBROUTINE h5tbinsert_field_kind_8_rank_1(loc_id,dset_name,field_name,field_type
     errcode = h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,field_type,field_index,f_ptr)
   END SUBROUTINE h5tbinsert_field_kind_8_rank_1
 !DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5tbinsert_field_kind_10_rank_1
-!DEC$endif
-  SUBROUTINE h5tbinsert_field_kind_10_rank_1(loc_id,dset_name,field_name,field_type,field_index,buf,errcode)
-    IMPLICIT NONE
-        INTEGER(hid_t),   INTENT(in) :: loc_id
-        CHARACTER(LEN=*), INTENT(in) :: dset_name
-        CHARACTER(LEN=*), INTENT(in) :: field_name
-        INTEGER(hid_t), INTENT(in)   :: field_type
-        INTEGER, INTENT(in) :: field_index
-        REAL(KIND=10), INTENT(IN), DIMENSION(*), TARGET :: buf
-        INTEGER(size_t) :: namelen
-        INTEGER(size_t) :: namelen1
-        INTEGER :: errcode
-        TYPE(C_PTR) :: f_ptr
-    f_ptr = C_LOC(buf(1)            )
-    namelen = LEN(dset_name)
-    namelen1 = LEN(field_name)
-    errcode = h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,field_type,field_index,f_ptr)
-  END SUBROUTINE h5tbinsert_field_kind_10_rank_1
-!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbinsert_field_kind_16_rank_1
 !DEC$endif
   SUBROUTINE h5tbinsert_field_kind_16_rank_1(loc_id,dset_name,field_name,field_type,field_index,buf,errcode)

diff --git a/H/HDF5/bundled/files/darwin-arm64v8/H5Tinit.c b/H/HDF5/bundled/files/darwin-arm64v8/H5Tinit.c
@@ -13,8 +13,8 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Created:		Apr  8, 2023
- *			Erik Schnetter <eschnett@redshift.local>
+ * Created:		Apr 17, 2023
+ *			Mark Kittisopikul <kittisopikulm@kittisopikulm-wm1>
  *
  * Purpose:		This machine-generated source code contains
  *			information about the various integer and