rename internals to 'h5fortran'

scivision · scivision · commit 5a4462196e04 · 2022-07-21T16:51:13.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 file(READ ${CMAKE_CURRENT_LIST_DIR}/codemeta.json _j)
 string(JSON PROJECT_VERSION GET ${_j} version)
 
-project(h5mpi
+project(h5fortran
 LANGUAGES C Fortran
 VERSION ${PROJECT_VERSION}
 DESCRIPTION "Lightweight object-oriented HDF5 MPI parallel Fortran interface"
@@ -50,25 +50,25 @@ endif()
 
 # --- HDF5-MPI object oriented API
 
-add_library(h5mpi)
-target_include_directories(h5mpi PUBLIC
+add_library(h5fortran)
+target_include_directories(h5fortran PUBLIC
 $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
 $<INSTALL_INTERFACE:include>
 )
-target_link_libraries(h5mpi PUBLIC HDF5::HDF5 MPI::MPI_Fortran)
-set_target_properties(h5mpi PROPERTIES
+target_link_libraries(h5fortran PUBLIC HDF5::HDF5 MPI::MPI_Fortran)
+set_target_properties(h5fortran PROPERTIES
 Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include
 LABELS core
 VERSION ${PROJECT_VERSION}
 )
 
 # GLOBAL needed for use by FetchContent
-add_library(h5mpi::h5mpi INTERFACE IMPORTED GLOBAL)
-target_link_libraries(h5mpi::h5mpi INTERFACE h5mpi)
+add_library(h5fortran::h5fortran INTERFACE IMPORTED GLOBAL)
+target_link_libraries(h5fortran::h5fortran INTERFACE h5fortran)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/h5mpi.mod TYPE INCLUDE)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/h5fortran.mod TYPE INCLUDE)
 
-install(TARGETS h5mpi EXPORT ${PROJECT_NAME}-targets)
+install(TARGETS h5fortran EXPORT ${PROJECT_NAME}-targets)
 
 add_subdirectory(src)
 
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library(perf OBJECT
 median.f90
 ${CMAKE_CURRENT_BINARY_DIR}/perf.f90
 )
-target_link_libraries(perf PRIVATE h5mpi HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(perf PRIVATE h5fortran HDF5::HDF5 MPI::MPI_Fortran)
 
 add_library(kernel OBJECT kernel.f90)
 add_library(partition OBJECT partition.f90)
diff --git a/benchmark/perf.in.f90 b/benchmark/perf.in.f90
@@ -3,7 +3,7 @@ module perf
 use, intrinsic :: iso_fortran_env, only : int64, stderr=>error_unit, stdout=>output_unit, compiler_version
 use mpi, only : mpi_get_version, MPI_Get_library_version
 
-use h5mpi, only : hdf5_file, hdf5version, HSIZE_T
+use h5fortran, only : hdf5_file, hdf5version, HSIZE_T
 
 use median_mod, only : median
 
@@ -83,11 +83,11 @@ subroutine print_timing(Ncpu, comp_lvl, bits, dims, t_elapsed, file_bytes, debug
 call f%write("/hdf5version", hdf5version())
 
 call mpi_get_version(mpi_api_version(1), mpi_api_version(2), ierr)
-if(ierr /= 0) error stop "h5mpi:perf: mpi_get_version failed"
+if(ierr /= 0) error stop "h5fortran:perf: mpi_get_version failed"
 call f%write("/mpi_api_version", mpi_api_version)
 
 call MPI_Get_library_version(mpi_lib_version, L, ierr)
-if(ierr /= 0) error stop "h5mpi:perf: MPI_Get_library_version failed"
+if(ierr /= 0) error stop "h5fortran:perf: MPI_Get_library_version failed"
 call f%write("/mpi_lib_version", mpi_lib_version)
 
 call f%close()
diff --git a/benchmark/test/CMakeLists.txt b/benchmark/test/CMakeLists.txt
@@ -1,20 +1,20 @@
 add_executable(slab_mpi_write slab_mpi_write.f90)
-target_link_libraries(slab_mpi_write PRIVATE h5mpi cli perf test_utils kernel HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(slab_mpi_write PRIVATE h5fortran cli perf test_utils kernel HDF5::HDF5 MPI::MPI_Fortran)
 add_executable(slab_mpi_read slab_mpi_read.f90)
-target_link_libraries(slab_mpi_read PRIVATE h5mpi cli perf HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(slab_mpi_read PRIVATE h5fortran cli perf HDF5::HDF5 MPI::MPI_Fortran)
 
 add_library(test_utils OBJECT utils.f90)
 target_link_libraries(test_utils PRIVATE kernel MPI::MPI_Fortran)
 
 add_executable(slab_mpi_serial_write slab_mpi_serial_write.f90)
-target_link_libraries(slab_mpi_serial_write PRIVATE h5mpi cli perf test_utils kernel HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(slab_mpi_serial_write PRIVATE h5fortran cli perf test_utils kernel HDF5::HDF5 MPI::MPI_Fortran)
 add_executable(slab_mpi_serial_read slab_mpi_serial_read.f90)
-target_link_libraries(slab_mpi_serial_read PRIVATE h5mpi cli perf HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(slab_mpi_serial_read PRIVATE h5fortran cli perf HDF5::HDF5 MPI::MPI_Fortran)
 
 add_executable(slab_serial_write slab_serial_write.f90)
-target_link_libraries(slab_serial_write PRIVATE h5mpi cli perf test_utils kernel HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(slab_serial_write PRIVATE h5fortran cli perf test_utils kernel HDF5::HDF5 MPI::MPI_Fortran)
 add_executable(slab_serial_read slab_serial_read.f90)
-target_link_libraries(slab_serial_read PRIVATE h5mpi cli perf HDF5::HDF5 MPI::MPI_Fortran)
+target_link_libraries(slab_serial_read PRIVATE h5fortran cli perf HDF5::HDF5 MPI::MPI_Fortran)
 
 cmake_path(GET HDF5_C_LIBRARY PARENT_PATH HDF5_LIBRARY_DIR)
 cmake_path(GET HDF5_LIBRARY_DIR PARENT_PATH HDF5_DIR)
diff --git a/benchmark/test/slab_mpi_read.f90 b/benchmark/test/slab_mpi_read.f90
@@ -6,7 +6,7 @@ program read_slab_mpi
 use, intrinsic :: iso_fortran_env, only : int32, int64, real64, real32, stderr=>error_unit
 use mpi, only : mpi_comm_size, mpi_comm_rank, mpi_integer
 
-use h5mpi, only : mpi_h5comm, hdf5_file, HSIZE_T
+use h5fortran, only : mpi_h5comm, hdf5_file, HSIZE_T
 
 use cli, only : get_cli
 use perf, only : print_timing, sysclock2ms
diff --git a/benchmark/test/slab_mpi_serial_read.f90 b/benchmark/test/slab_mpi_serial_read.f90
@@ -6,7 +6,7 @@ program read_slab_mpi_root
 use, intrinsic :: iso_fortran_env, only : int32, int64, real64, stderr=>error_unit
 use mpi, only : mpi_comm_rank, mpi_comm_size, mpi_integer, mpi_real, mpi_status_ignore
 
-use h5mpi, only : mpi_h5comm, hdf5_file, mpi_tags, HSIZE_T
+use h5fortran, only : mpi_h5comm, hdf5_file, mpi_tags, HSIZE_T
 
 use cli, only : get_cli
 use perf, only : print_timing, sysclock2ms
diff --git a/benchmark/test/slab_mpi_serial_write.f90 b/benchmark/test/slab_mpi_serial_write.f90
@@ -8,7 +8,7 @@ program write_slab_mpi_root
 
 use mpi, only : mpi_comm_rank, mpi_comm_size, mpi_integer, mpi_real, mpi_status_ignore
 
-use h5mpi, only : mpi_h5comm, hdf5_file, mpi_tags
+use h5fortran, only : mpi_h5comm, hdf5_file, mpi_tags
 
 use cli, only : get_cli, get_simsize
 use perf, only : print_timing, sysclock2ms
diff --git a/benchmark/test/slab_mpi_write.f90 b/benchmark/test/slab_mpi_write.f90
@@ -8,7 +8,7 @@ program write_slab_mpi
 
 use mpi, only : mpi_comm_size, mpi_comm_rank, mpi_integer
 
-use h5mpi, only : mpi_h5comm, hdf5_file, mpi_tags, HSIZE_T
+use h5fortran, only : mpi_h5comm, hdf5_file, mpi_tags, HSIZE_T
 
 use cli, only : get_cli, get_simsize
 use perf, only : print_timing, sysclock2ms
diff --git a/benchmark/test/slab_serial_read.f90 b/benchmark/test/slab_serial_read.f90
@@ -3,7 +3,7 @@ program read_slab_serial
 
 use, intrinsic :: iso_fortran_env, only : int64, real32, real64, stderr=>error_unit
 
-use h5mpi, only : hdf5_file, HSIZE_T
+use h5fortran, only : hdf5_file, HSIZE_T
 
 use cli, only : get_cli
 use perf, only : print_timing
diff --git a/benchmark/test/slab_serial_write.f90 b/benchmark/test/slab_serial_write.f90
@@ -2,7 +2,7 @@ program write_slab_serial
 !! no MPI / parallel at all
 
 use, intrinsic :: iso_fortran_env, only : int64, real32, real64, stderr=>error_unit
-use h5mpi, only : hdf5_file
+use h5fortran, only : hdf5_file
 use cli, only : get_cli, get_simsize
 use perf, only : print_timing
 use kernel, only : phantom
diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
@@ -8,6 +8,10 @@ find_dependency(HDF5 COMPONENTS Fortran parallel)
 
 find_dependency(MPI COMPONENTS C Fortran)
 
+if(HDF5_FOUND AND MPI_FOUND)
+  set(@PROJECT_NAME@_HAVE_PARALLEL true)
+endif()
+
 include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)
 
 check_required_components(@PROJECT_NAME@)
diff --git a/codemeta.json b/codemeta.json
@@ -3,11 +3,11 @@
     "@type": "SoftwareSourceCode",
     "codeRepository": "https://github.com/geospace-code/h5fortran-mpi",
     "contIntegration": "https://github.com/geospace-code/h5fortran-mpi/actions",
-    "dateModified": "2022-07-17",
+    "dateModified": "2022-07-21",
     "downloadUrl": "https://github.com/geospace-code/h5fortran-mpi/releases",
     "issueTracker": "https://github.com/geospace-code/h5fortran-mpi/issues",
     "name": "h5fortran-mpi",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "identifier": "10.5281/zenodo.5847354",
     "description": "Lightweight object-oriented HDF5-MPI parallel Fortran interface",
     "applicationCategory": "file I/O",
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -7,11 +7,11 @@ LANGUAGES C Fortran
 enable_testing()
 
 find_package(MPI COMPONENTS C Fortran REQUIRED)
-find_package(h5mpi CONFIG REQUIRED)
+find_package(h5fortran CONFIG REQUIRED)
 
 # --- example 1
 add_executable(example1 example1.f90)
-target_link_libraries(example1 h5mpi::h5mpi MPI::MPI_Fortran MPI::MPI_C)
+target_link_libraries(example1 h5fortran::h5fortran MPI::MPI_Fortran MPI::MPI_C)
 
 add_test(NAME Example1 COMMAND example1)
 set_tests_properties(Example1 PROPERTIES
diff --git a/example/example1.f90 b/example/example1.f90
@@ -4,7 +4,7 @@ program example2
 
 use mpi, only : mpi_init, MPI_COMM_WORLD, mpi_comm_rank, mpi_comm_size
 
-use h5mpi, only : hdf5_file, HSIZE_T
+use h5fortran, only : hdf5_file, HSIZE_T
 
 implicit none (type, external)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ hdf5_compression_flag()
 configure_file(hdf5_config.f90.in hdf5_config.f90 @ONLY)
 
 # main library
-target_sources(h5mpi PRIVATE
+target_sources(h5fortran PRIVATE
 utils.f90
 ${CMAKE_CURRENT_BINARY_DIR}/hdf5_config.f90
 read.f90 read_scalar.f90 read_scalar_ascii.f90 reader.f90
diff --git a/src/attr.f90 b/src/attr.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi) attr_smod
+submodule (h5fortran) attr_smod
 
 use hdf5, only : H5S_SCALAR_F, &
 H5Aexists_by_name_f, H5Aopen_by_name_f, H5Aclose_f, H5Acreate_by_name_f, H5Adelete_f, &
diff --git a/src/attr_read.f90 b/src/attr_read.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:attr_smod) attr_read
+submodule (h5fortran:attr_smod) attr_read
 
 use, intrinsic :: iso_c_binding, only : C_CHAR, C_NULL_CHAR, C_F_POINTER
 
diff --git a/src/attr_write.f90 b/src/attr_write.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:attr_smod) attr_write
+submodule (h5fortran:attr_smod) attr_write
 
 use hdf5, only: H5Awrite_f
 
diff --git a/src/fpm_config.f90 b/src/fpm_config.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi) h5conf
+submodule (h5fortran) h5conf
 
 implicit none (type, external)
 
diff --git a/src/hdf5_config.f90.in b/src/hdf5_config.f90.in
@@ -1,4 +1,4 @@
-submodule (h5mpi) h5conf
+submodule (h5fortran) h5conf
 
 implicit none (type, external)
 
diff --git a/src/interface.f90 b/src/interface.f90
@@ -1,4 +1,4 @@
-module h5mpi
+module h5fortran
 
 use, intrinsic :: iso_c_binding, only : c_ptr, c_loc
 use, intrinsic :: iso_fortran_env, only : real32, real64, int32, int64, stderr=>error_unit
@@ -579,4 +579,4 @@ module integer(HSIZE_T) function hdf_filesize(self)
 
 end interface
 
-end module h5mpi
+end module h5fortran
diff --git a/src/read.f90 b/src/read.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi) hdf5_read
+submodule (h5fortran) hdf5_read
 
 use, intrinsic:: iso_c_binding, only : c_null_char
 
diff --git a/src/read_scalar.f90 b/src/read_scalar.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:hdf5_read) read_scalar
+submodule (h5fortran:hdf5_read) read_scalar
 
 use hdf5, only : H5Dread_f, &
 H5Sclose_f
diff --git a/src/read_scalar_ascii.f90 b/src/read_scalar_ascii.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:read_scalar) read_scalar_ascii
+submodule (h5fortran:read_scalar) read_scalar_ascii
 
 use, intrinsic :: iso_c_binding, only : C_CHAR, C_F_POINTER
 use hdf5, only : H5T_STR_NULLTERM_F, &
diff --git a/src/reader.f90 b/src/reader.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:hdf5_read) hdf5_reader
+submodule (h5fortran:hdf5_read) hdf5_reader
 
 use hdf5, only: h5dread_f, h5sclose_f
 
diff --git a/src/utils.f90 b/src/utils.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi) utils_smod
+submodule (h5fortran) utils_smod
 
 use hdf5, only: h5get_libversion_f, &
 h5eset_auto_f, &
@@ -352,7 +352,7 @@
 
 ! print *, 'TRACE:mpi_hyperslab: ' // dset_name //': istart', i0, 'C mem_dims: ', c_mem_dims, 'mem_dims', mem_dims
 
-if(any(c_mem_dims < 1)) error stop "ERROR:h5mpi:hyperslab:non-positive hyperslab: " // dset_name
+if(any(c_mem_dims < 1)) error stop "ERROR:h5fortran:hyperslab:non-positive hyperslab: " // dset_name
 
 call h5sselect_hyperslab_f(filespace, H5S_SELECT_SET_F, &
 start=i0, &
diff --git a/src/write.f90 b/src/write.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi) write
+submodule (h5fortran) write
 
 use hdf5, only: &
 h5fflush_f, &
diff --git a/src/write_scalar.f90 b/src/write_scalar.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:write) write_scalar
+submodule (h5fortran:write) write_scalar
 
 use hdf5, only: h5dwrite_f, h5sselect_none_f
 
diff --git a/src/writer.f90 b/src/writer.f90
@@ -1,4 +1,4 @@
-submodule (h5mpi:write) writer
+submodule (h5fortran:write) writer
 
 use hdf5, only: h5dwrite_f, h5sselect_none_f
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -21,7 +21,7 @@ function(nompi_test names)
 foreach(name IN LISTS names)
 
 add_executable(test_${name} test_${name}.f90)
-target_link_libraries(test_${name} PRIVATE h5mpi::h5mpi)
+target_link_libraries(test_${name} PRIVATE h5fortran::h5fortran)
 
 add_test(NAME ${name} COMMAND test_${name})
 
@@ -39,7 +39,7 @@ function(mpi_test names use_runner)
 foreach(name IN LISTS names)
 
 add_executable(test_${name} test_${name}.f90)
-target_link_libraries(test_${name} PRIVATE h5mpi::h5mpi)
+target_link_libraries(test_${name} PRIVATE h5fortran::h5fortran)
 
 if(use_runner)
   set(cmd test_runner -exe $<TARGET_FILE:test_${name}> -mpiexec ${MPIEXEC_EXECUTABLE} -lx 1000)
diff --git a/test/test_array.f90 b/test/test_array.f90
@@ -3,7 +3,7 @@ program array_test
 use, intrinsic:: ieee_arithmetic, only: ieee_value, ieee_quiet_nan, ieee_is_nan
 use, intrinsic :: iso_fortran_env, only: real32, real64, int32, stderr=>error_unit
 
-use h5mpi, only : hdf5_file, HSIZE_T, H5T_NATIVE_INTEGER
+use h5fortran, only : hdf5_file, HSIZE_T, H5T_NATIVE_INTEGER
 
 implicit none (type, external)
 
diff --git a/test/test_array_mpi.f90 b/test/test_array_mpi.f90
@@ -3,7 +3,7 @@ program array_test
 use, intrinsic:: ieee_arithmetic, only: ieee_value, ieee_quiet_nan, ieee_is_nan
 use, intrinsic :: iso_fortran_env, only: real32, real64, int32, stderr=>error_unit
 
-use h5mpi, only : hdf5_file, HSIZE_T, H5T_NATIVE_INTEGER
+use h5fortran, only : hdf5_file, HSIZE_T, H5T_NATIVE_INTEGER
 use mpi, only : mpi_init, MPI_COMM_WORLD, mpi_comm_rank, mpi_barrier
 
 implicit none (type, external)
diff --git a/test/test_attributes.f90 b/test/test_attributes.f90
@@ -2,7 +2,7 @@ program test_attributes
 
 use, intrinsic:: iso_fortran_env, only: int32, real32, real64, stderr=>error_unit
 
-use h5mpi, only: hdf5_file
+use h5fortran, only: hdf5_file
 use mpi, only : mpi_init, MPI_COMM_WORLD, mpi_comm_rank
 
 implicit none (type, external)
diff --git a/test/test_cast.f90 b/test/test_cast.f90
@@ -1,7 +1,7 @@
 program test_cast
 !! test HDF5 built-in casting
 
-use h5mpi, only : hdf5_file, &
+use h5fortran, only : hdf5_file, &
 H5T_INTEGER_F, H5T_FLOAT_F, H5T_STRING_F, &
 H5T_NATIVE_REAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_INTEGER, H5T_NATIVE_CHARACTER, H5T_STD_I64LE
 
diff --git a/test/test_deflate_props.f90 b/test/test_deflate_props.f90
@@ -5,7 +5,7 @@ program test_deflate_props
 use hdf5, only : H5D_CHUNKED_F, H5D_CONTIGUOUS_F
 use mpi, only : mpi_init, mpi_comm_rank, mpi_comm_size, MPI_COMM_WORLD
 
-use h5mpi, only: hdf5_file, HSIZE_T, has_parallel_compression
+use h5fortran, only: hdf5_file, HSIZE_T, has_parallel_compression
 
 implicit none (type, external)
 
diff --git a/test/test_deflate_read.f90 b/test/test_deflate_read.f90
@@ -3,7 +3,7 @@ program test_deflate_read
 use, intrinsic:: iso_fortran_env, only: int32, int64, real32, real64, stderr=>error_unit
 use mpi, only : mpi_init, mpi_comm_rank, mpi_comm_size, MPI_COMM_WORLD
 
-use h5mpi, only: hdf5_file
+use h5fortran, only: hdf5_file
 
 implicit none (type, external)
 
diff --git a/test/test_deflate_write.f90 b/test/test_deflate_write.f90
@@ -8,7 +8,7 @@ program test_deflate
 
 use mpi, only : mpi_init, mpi_comm_rank, mpi_comm_size, MPI_COMM_WORLD
 
-use h5mpi, only: hdf5_file, HSIZE_T
+use h5fortran, only: hdf5_file, HSIZE_T
 
 implicit none (type, external)
 
diff --git a/test/test_destructor.f90 b/test/test_destructor.f90
diff --git a/test/test_exist.f90 b/test/test_exist.f90
diff --git a/test/test_fill.f90 b/test/test_fill.f90
diff --git a/test/test_groups.f90 b/test/test_groups.f90
diff --git a/test/test_layout.f90 b/test/test_layout.f90
diff --git a/test/test_shape.f90 b/test/test_shape.f90
diff --git a/test/test_string.f90 b/test/test_string.f90
diff --git a/test/test_string_read.f90 b/test/test_string_read.f90
diff --git a/test/test_write.f90 b/test/test_write.f90

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ add_library(perf OBJECT`
`22`	`22`	`median.f90`
`23`	`23`	`${CMAKE_CURRENT_BINARY_DIR}/perf.f90`
`24`	`24`	`)`
`25`		`-target_link_libraries(perf PRIVATE h5mpi HDF5::HDF5 MPI::MPI_Fortran)`
	`25`	`+target_link_libraries(perf PRIVATE h5fortran HDF5::HDF5 MPI::MPI_Fortran)`
`26`	`26`
`27`	`27`	`add_library(kernel OBJECT kernel.f90)`
`28`	`28`	`add_library(partition OBJECT partition.f90)`