add nompi deflate tests

add nompi destructor tests

Author: scivision

test/CMakeLists.txt

@@ -56,10 +56,21 @@ cmake_path(SET string_file ${CMAKE_CURRENT_BINARY_DIR}/test_string_py.h5)
 
 # --- non-MPI tests
 
-set(nompi_tests array attributes cast)
+set(nompi_tests array attributes cast deflate_props deflate_read deflate_write destructor
+exist
+)
 
 nompi_test("${nompi_tests}")
 
+set_tests_properties(deflate_write PROPERTIES
+FIXTURES_SETUP deflate_files
+)
+
+set_tests_properties(deflate_props deflate_read PROPERTIES
+FIXTURES_REQUIRED deflate_files
+REQUIRED_FILES ${CMAKE_CURRENT_BINARY_DIR}/deflate1.h5
+)
+
 
 # --- runner
 
@@ -80,13 +91,14 @@ endif()
 
 # --- MPI tests
 
-set(mpi_tests array_mpi attributes_mpi cast_mpi destructor exist fill groups layout shape
+set(mpi_tests array_mpi attributes_mpi cast_mpi destructor_mpi exist_mpi
+fill groups layout shape
 string string_read write
 )
 
 mpi_test("${mpi_tests}" false)
 
-set(runner_tests deflate_write deflate_props deflate_read)
+set(runner_tests deflate_write_mpi deflate_props_mpi deflate_read_mpi)
 
 mpi_test("${runner_tests}" true)
 
@@ -101,12 +113,12 @@ FIXTURES_REQUIRED test_files
 REQUIRED_FILES "${CMAKE_CURRENT_BINARY_DIR}/test_write.h5;${CMAKE_CURRENT_BINARY_DIR}/test_layout.h5"
 )
 
-set_tests_properties(deflate_write PROPERTIES
-FIXTURES_SETUP deflate_files
+set_tests_properties(deflate_write_mpi PROPERTIES
+FIXTURES_SETUP deflate_files_mpi
 )
 
-set_tests_properties(deflate_props deflate_read PROPERTIES
-FIXTURES_REQUIRED deflate_files
+set_tests_properties(deflate_props_mpi deflate_read_mpi PROPERTIES
+FIXTURES_REQUIRED deflate_files_mpi
 REQUIRED_FILES ${CMAKE_CURRENT_BINARY_DIR}/deflate1.h5
 )
 

test/test_deflate_props.f90

@@ -3,62 +3,42 @@ program test_deflate_props
 use, intrinsic :: iso_fortran_env, only : int64, stderr=>output_unit
 
 use hdf5, only : H5D_CHUNKED_F, H5D_CONTIGUOUS_F
-use mpi, only : mpi_init, mpi_comm_rank, mpi_comm_size, MPI_COMM_WORLD
 
-use h5fortran, only: hdf5_file, HSIZE_T, has_parallel_compression
+use h5fortran, only: hdf5_file, HSIZE_T
 
 implicit none (type, external)
 
-external :: mpi_finalize
-
 character(*), parameter :: fn1='deflate1.h5'
 integer, parameter :: N(2) = [50, 1000], &
 MIN_COMP = 2  !< lots of CPUs, smaller arrays => poorer compression
 
-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_read_deflate_props(fn1, N, mpi_id)
-if(mpi_id == 0) print *,'OK: HDF5 read deflate properties'
+call test_read_deflate_props(fn1, N)
+print *,'OK: HDF5 read deflate properties'
 
 call test_get_deflate(fn1)
-if(mpi_id == 0) print *, 'OK: HDF5 get deflate'
-
-call mpi_finalize(ierr)
-if (ierr /= 0) error stop "mpi_finalize"
+print *, 'OK: HDF5 get deflate'
 
 contains
 
 
-subroutine test_read_deflate_props(fn, N, mpi_id)
+subroutine test_read_deflate_props(fn, N)
 
 character(*), intent(in) :: fn
-integer, intent(in) :: N(2), mpi_id
+integer, intent(in) :: N(2)
 
 type(hdf5_file) :: h5f
 
-integer ::  fsize, layout
-integer(int64) :: crat
+integer :: layout
+real :: fsize, crat
 integer(HSIZE_T) :: chunks(2)
 
-if(mpi_id == 0) then
-  inquire(file=fn, size=fsize)
-  crat = (N(1) * N(2) * 32 / 8) / fsize
-  print '(A,F6.2,A,I6)','#1 filesize (Mbytes): ',fsize/1e6, '  compression ratio:',crat
-  if (has_parallel_compression()) then
-    if(crat < MIN_COMP) error stop '2D low compression'
-  else
-    print *, "test_read_deflate_props: MPI commpression was disabled, so " // fn // " was not compressed."
-  endif
-endif
+call h5f%open(fn, action='r')
+
+fsize = real(h5f%filesize())
 
-call h5f%open(fn, action='r', mpi=.true.)
+crat = (N(1) * N(2) * 32 / 8) / fsize
+print '(A,F6.2,A,f7.1)','#1 filesize (Mbytes): ',fsize/1e6, '  compression ratio:',crat
+if(crat < MIN_COMP) error stop '2D low compression'
 
 layout = h5f%layout('/A')
 if(layout /= H5D_CHUNKED_F) error stop '#1 not chunked layout: ' // fn
@@ -85,15 +65,9 @@ subroutine test_get_deflate(fn)
 
 type(hdf5_file) :: h5f
 
-call h5f%open(fn, action='r', mpi=.true.)
-
-if (h5f%parallel_compression) then
-  if (.not. h5f%deflate("/A")) error stop "test_get_deflate: expected deflate MPI"
-else
-  if (h5f%deflate("/A")) error stop "test_get_deflate: expected no deflate MPI"
-endif
+call h5f%open(fn, action='r')
 
-if (.not. h5f%deflate("/noMPI")) error stop "expected deflate as dataset was written without MPI"
+if (.not. h5f%deflate("/A")) error stop "test_get_deflate: expected deflate"
 
 call h5f%close()
 

test/test_deflate_props_mpi.f90

@@ -0,0 +1,102 @@
+program test_deflate_props
+
+use, intrinsic :: iso_fortran_env, only : int64, stderr=>output_unit
+
+use hdf5, only : H5D_CHUNKED_F, H5D_CONTIGUOUS_F
+use mpi, only : mpi_init, mpi_comm_rank, mpi_comm_size, MPI_COMM_WORLD
+
+use h5fortran, only: hdf5_file, HSIZE_T, has_parallel_compression
+
+implicit none (type, external)
+
+external :: mpi_finalize
+
+character(*), parameter :: fn1='deflate1.h5'
+integer, parameter :: N(2) = [50, 1000], &
+MIN_COMP = 2  !< lots of CPUs, smaller arrays => poorer compression
+
+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_read_deflate_props(fn1, N, mpi_id)
+if(mpi_id == 0) print *,'OK: HDF5 read deflate properties'
+
+call test_get_deflate(fn1)
+if(mpi_id == 0) print *, 'OK: HDF5 get deflate'
+
+call mpi_finalize(ierr)
+if (ierr /= 0) error stop "mpi_finalize"
+
+contains
+
+
+subroutine test_read_deflate_props(fn, N, mpi_id)
+
+character(*), intent(in) :: fn
+integer, intent(in) :: N(2), mpi_id
+
+type(hdf5_file) :: h5f
+
+integer ::  fsize, layout
+integer(int64) :: crat
+integer(HSIZE_T) :: chunks(2)
+
+if(mpi_id == 0) then
+  inquire(file=fn, size=fsize)
+  crat = (N(1) * N(2) * 32 / 8) / fsize
+  print '(A,F6.2,A,I6)','#1 filesize (Mbytes): ',fsize/1e6, '  compression ratio:',crat
+  if (has_parallel_compression()) then
+    if(crat < MIN_COMP) error stop '2D low compression'
+  else
+    print *, "test_read_deflate_props: MPI commpression was disabled, so " // fn // " was not compressed."
+  endif
+endif
+
+call h5f%open(fn, action='r', mpi=.true.)
+
+layout = h5f%layout('/A')
+if(layout /= H5D_CHUNKED_F) error stop '#1 not chunked layout: ' // fn
+if(.not.h5f%is_chunked('/A')) error stop '#1 not chunked layout: ' // fn
+call h5f%chunks('/A', chunks)
+if(chunks(1) /= 5) then
+  write(stderr, '(a,2I5)') "expected chunks(1) = 5 but got chunks ", chunks
+  error stop '#1 get_chunk mismatch'
+endif
+layout = h5f%layout('/small_contig')
+if(layout /= H5D_CONTIGUOUS_F) error stop '#1 not contiguous layout'
+if(.not.h5f%is_contig('/small_contig')) error stop '#1 not contig layout'
+call h5f%chunks('/small_contig', chunks)
+if(any(chunks(:2) /= -1)) error stop '#1 get_chunk mismatch'
+
+call h5f%close()
+
+end subroutine test_read_deflate_props
+
+
+subroutine test_get_deflate(fn)
+
+character(*), intent(in) :: fn
+
+type(hdf5_file) :: h5f
+
+call h5f%open(fn, action='r', mpi=.true.)
+
+if (h5f%parallel_compression) then
+  if (.not. h5f%deflate("/A")) error stop "test_get_deflate: expected deflate MPI"
+else
+  if (h5f%deflate("/A")) error stop "test_get_deflate: expected no deflate MPI"
+endif
+
+if (.not. h5f%deflate("/noMPI")) error stop "expected deflate as dataset was written without MPI"
+
+call h5f%close()
+
+end subroutine test_get_deflate
+
+end program

test/test_deflate_read.f90

@@ -1,69 +1,33 @@
 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 h5fortran, only: hdf5_file
 
 implicit none (type, external)
 
-external :: mpi_finalize
-
-integer :: ierr, mpi_id, Nmpi
 character(*), parameter :: fn1='deflate1.h5'
-integer, parameter :: N(2) = [50, 1000], &
-MIN_COMP = 2  !< lots of CPUs, smaller arrays => poorer compression
-
-
-call mpi_init(ierr)
-if (ierr /= 0) error stop "mpi_init"
-
-call mpi_comm_size(MPI_COMM_WORLD, Nmpi, ierr)
-if(ierr/=0) error stop "mpi_comm_size"
-call mpi_comm_rank(MPI_COMM_WORLD, mpi_id, ierr)
-if(ierr/=0) error stop "mpi_comm_rank"
+integer, parameter :: N(2) = [50, 1000]
 
-call test_read_deflate(fn1, N, mpi_id, Nmpi)
-if(mpi_id==0) print *,'OK: HDF5 read deflate'
 
-call mpi_finalize(ierr)
-if (ierr /= 0) error stop "mpi_finalize"
+call test_read_deflate(fn1, N)
+print *,'OK: HDF5 read deflate'
 
 contains
 
-subroutine test_read_deflate(fn, N, mpi_id, Nmpi)
+subroutine test_read_deflate(fn, N)
 
 character(*), intent(in) :: fn
-integer, intent(in) :: N(2), Nmpi, mpi_id
+integer, intent(in) :: N(2)
 
 type(hdf5_file) :: h5f
-integer :: i0(2), i1(2), dx2
 real(real32), allocatable :: A(:,:)
-logical :: debug = .false.
-
-!> MPI partition
-if(mpi_id == 0) then
-  if (Nmpi > 1 .and. (modulo(N(2), Nmpi) /= 0 .or. Nmpi > N(2))) then
-    write(stderr, '(a,1x,i0,1x,i0)') "test_deflate_props: MPI worker count must be multiple of N", N(2), Nmpi
-    error stop fn
-  endif
-end if
-
-dx2 = N(2) / Nmpi
-
-allocate(A(N(1), dx2))
-
-i0(1) = 1
-i0(2) = mpi_id * dx2 + 1
-i1(1) = size(A, 1)
-i1(2) = i0(2) + dx2 - 1
 
-!> read with MPI
-if(debug) print '(a,i0,1x,2i5,2x,2i5)', "#1 partition: mpi_id, i0, i1 ", mpi_id, i0, i1
+allocate(A(N(1), N(2)))
 
-call h5f%open(fn, action='r', mpi=.true.)
-call h5f%read('/A', A, istart=i0, iend=i1)
-call h5f%read('/noMPI', A, istart=i0, iend=i1)  !< compressed with MPI
+call h5f%open(fn, action='r')
+call h5f%read('/A', A)
+call h5f%read('/noMPI', A)
 call h5f%close()
 
 end subroutine test_read_deflate