add no mpi cast test

Author: scivision

test/CMakeLists.txt

@@ -56,7 +56,7 @@ cmake_path(SET string_file ${CMAKE_CURRENT_BINARY_DIR}/test_string_py.h5)
 
 # --- non-MPI tests
 
-set(nompi_tests array attributes)
+set(nompi_tests array attributes cast)
 
 nompi_test("${nompi_tests}")
 
@@ -80,7 +80,7 @@ endif()
 
 # --- MPI tests
 
-set(mpi_tests array_mpi attributes_mpi cast destructor exist fill groups layout shape
+set(mpi_tests array_mpi attributes_mpi cast_mpi destructor exist fill groups layout shape
 string string_read write
 )
 

test/test_array.f90

@@ -52,7 +52,7 @@ subroutine test_basic_array(filename)
 r1 = i1
 r2 = i2
 
-call h%open(filename, action='w', comp_lvl=1, mpi=.false.)
+call h%open(filename, action='w', comp_lvl=1)
 
 call h%write('/int32-1d', i1)
 call h%write('/test/group2/int32-2d', i2)
@@ -62,7 +62,7 @@ subroutine test_basic_array(filename)
 call h%close()
 
 !! read
-call h%open(filename, action='r', mpi=.false.)
+call h%open(filename, action='r')
 
 !> int32
 call h%read('/int32-1d', i1t)
@@ -112,7 +112,7 @@ subroutine test_read_slice(filename)
   i2(i,:) = i2(1,:) * i
 enddo
 
-call h%open(filename, action='r', mpi=.false.)
+call h%open(filename, action='r')
 
 i1t = 0
 call h%read('/int32-1d', i1t(:2), istart=[2], iend=[3], stride=[1])
@@ -151,7 +151,7 @@ subroutine test_write_slice(filename)
 
 dims = [3]
 
-call h%open(filename, action='r+', debug=.true., mpi=.false.)
+call h%open(filename, action='r+', debug=.true.)
 
 call h%create('/int32a-1d', dtype=H5T_NATIVE_INTEGER, dset_dims=dims)
 call h%write('/int32a-1d', [1,3], dset_dims=dims, istart=[1], iend=[2])
@@ -203,7 +203,7 @@ subroutine test_readwrite_array(filename, ng, nn, pn)
 flux = 1.0
 write(pnc,'(I2)') pn
 
-call h%open(filename, action='rw', mpi=.false.)
+call h%open(filename, action='rw')
 
 do i = 1,ng
   write(ic,'(I2)') i

test/test_cast.f90

@@ -2,36 +2,19 @@ program test_cast
 !! test HDF5 built-in casting
 
 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
-
-use mpi, only : mpi_init, MPI_COMM_WORLD, mpi_comm_rank
-
+ H5T_INTEGER_F, H5T_FLOAT_F, H5T_STRING_F, &
+ H5T_NATIVE_REAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_INTEGER, H5T_NATIVE_CHARACTER, H5T_STD_I64LE
 use, intrinsic :: iso_fortran_env, only : real32, real64, int32, int64
 
 implicit none (type, external)
 
-external :: mpi_finalize
-
 character(*), parameter :: fn = 'test_cast.h5'
-integer :: ierr, mpi_id
-
-call mpi_init(ierr)
-if (ierr /= 0) error stop "mpi_init"
-
-call mpi_comm_rank(MPI_COMM_WORLD, mpi_id, ierr)
-if (ierr /= 0) error stop "mpi_comm_rank"
-
 
 call test_cast_write(fn)
-if(mpi_id == 0) print "(A)", "OK: cast write"
+print "(A)", "OK: cast write"
 
 call test_cast_read(fn)
-if(mpi_id == 0) print "(A)", "OK: cast read"
-
-
-call mpi_finalize(ierr)
-if (ierr /= 0) error stop "mpi_finalize"
+print "(A)", "OK: cast read"
 
 
 contains
@@ -43,7 +26,7 @@ subroutine test_cast_write(fn)
 
 type(hdf5_file) :: h
 
-call h%open(fn, action='w', mpi=.true.)
+call h%open(fn, action='w')
 
 !> test values
 call h%write('/scalar_int32', 42_int32)
@@ -70,7 +53,7 @@ subroutine test_cast_read(fn)
 integer(int32) :: i32
 integer(int64) :: i64, i1_64(2)
 
-call h%open(fn, action='r', mpi=.true.)
+call h%open(fn, action='r')
 
 !> %class method
 if (h%class("/scalar_int32") /= H5T_INTEGER_F) error stop "int32 not integer"
@@ -95,6 +78,7 @@ subroutine test_cast_read(fn)
 if(i64 /= 42) error stop 'scalar cast int32 => int64'
 call h%read('/scalar_int64', i32)
 if(i32 /= 42) error stop 'scalar cast int64 => int32'
+print *, 'PASSED: scalar cast on read'
 
 !> 1D vector read casting -- real to int and int to real
 call h%read('/1d_real32', r1_64)
@@ -104,6 +88,8 @@ subroutine test_cast_read(fn)
 
 call h%close()
 
+print "(A)", "OK: cast"
+
 end subroutine test_cast_read
 
 end program

test/test_cast_mpi.f90

@@ -0,0 +1,109 @@
+program test_cast
+!! test HDF5 built-in casting
+
+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
+
+use mpi, only : mpi_init, MPI_COMM_WORLD, mpi_comm_rank
+
+use, intrinsic :: iso_fortran_env, only : real32, real64, int32, int64
+
+implicit none (type, external)
+
+external :: mpi_finalize
+
+character(*), parameter :: fn = 'test_cast.h5'
+integer :: ierr, mpi_id
+
+call mpi_init(ierr)
+if (ierr /= 0) error stop "mpi_init"
+
+call mpi_comm_rank(MPI_COMM_WORLD, mpi_id, ierr)
+if (ierr /= 0) error stop "mpi_comm_rank"
+
+
+call test_cast_write(fn)
+if(mpi_id == 0) print "(A)", "OK: cast write"
+
+call test_cast_read(fn)
+if(mpi_id == 0) print "(A)", "OK: cast read"
+
+
+call mpi_finalize(ierr)
+if (ierr /= 0) error stop "mpi_finalize"
+
+
+contains
+
+
+subroutine test_cast_write(fn)
+
+character(*), intent(in) :: fn
+
+type(hdf5_file) :: h
+
+call h%open(fn, action='w', mpi=.true.)
+
+!> test values
+call h%write('/scalar_int32', 42_int32)
+call h%write('/scalar_int64', 42_int64)
+call h%write('/scalar_real32', 42._real32)
+call h%write('/scalar_real64', 42._real64)
+call h%write('/1d_real32', [1._real32, 32._real32])
+call h%write('/1d_int32', [2_int32, 4_int32])
+call h%write('/char', "hello")
+
+call h%close()
+
+end subroutine test_cast_write
+
+
+subroutine test_cast_read(fn)
+
+character(*), intent(in) :: fn
+
+type(hdf5_file) :: h
+
+real(real64) :: r64, r1_64(2)
+real(real32) :: r32
+integer(int32) :: i32
+integer(int64) :: i64, i1_64(2)
+
+call h%open(fn, action='r', mpi=.true.)
+
+!> %class method
+if (h%class("/scalar_int32") /= H5T_INTEGER_F) error stop "int32 not integer"
+if (h%class("/scalar_int64") /= H5T_INTEGER_F) error stop "int64 not integer"
+if (h%class("/scalar_real32") /= H5T_FLOAT_F) error stop "real32 not float"
+if (h%class("/scalar_real64") /= H5T_FLOAT_F) error stop "real64 not float"
+if (h%class("/char") /= H5T_STRING_F) error stop "char not string"
+
+!> %dtype method
+if (h%dtype('/scalar_int32') /= H5T_NATIVE_INTEGER) error stop "int32 type"
+if (h%dtype("/scalar_int64") /= H5T_STD_I64LE) error stop "int64 type"
+if (h%dtype("/scalar_real32") /= H5T_NATIVE_REAL) error stop "real32 type"
+if (h%dtype("/scalar_real64") /= H5T_NATIVE_DOUBLE) error stop "real64 type"
+if (h%dtype("/char") /= H5T_NATIVE_CHARACTER) error stop "char type"
+
+!> read casting -- real32 to real64 and int32 to int64
+call h%read('/scalar_real32', r64)
+if(r64 /= 42) error stop 'scalar cast real32 => real64'
+call h%read('/scalar_real64', r32)
+if(r32 /= 42) error stop 'scalar cast real64 => real32'
+call h%read('/scalar_int32', i64)
+if(i64 /= 42) error stop 'scalar cast int32 => int64'
+call h%read('/scalar_int64', i32)
+if(i32 /= 42) error stop 'scalar cast int64 => int32'
+
+!> 1D vector read casting -- real to int and int to real
+call h%read('/1d_real32', r1_64)
+if (.not.all([1., 32.] == r1_64)) error stop '1D cast real32 => real64'
+call h%read('/1d_int32', i1_64)
+if (.not.all([2, 4] == i1_64)) error stop '1D cast int32 => int64'
+
+call h%close()
+
+end subroutine test_cast_read
+
+end program