Don't transpose 4-d kernel; already stored correctly

Author: milancurcic

src/nf/io/nf_io_hdf5_submodule.f90

@@ -59,15 +59,7 @@ module subroutine get_hdf5_dataset_real32_1d(filename, object_name, values)
     call f % open(filename, 'r')
     call f % shape(object_name, dims)
 
-    ! If values is already allocated, re-allocate only if incorrect shape
-    if (allocated(values)) then
-      if (.not. all(shape(values) == dims)) then
-        deallocate(values)
-        allocate(values(dims(1)))
-      end if
-    else
-      allocate(values(dims(1)))
-    end if
+    allocate(values(dims(1)))
 
     call f % read(object_name, values)
     call f % close()
@@ -92,7 +84,7 @@ module subroutine get_hdf5_dataset_real32_2d(filename, object_name, values)
     call f % read(object_name, values)
     call f % close()
 
-    ! Transpose the array to get from C to Fortran order
+    ! Transpose the array to respect Keras's storage order
     values = transpose(values)
 
   end subroutine get_hdf5_dataset_real32_2d
@@ -115,13 +107,6 @@ module subroutine get_hdf5_dataset_real32_4d(filename, object_name, values)
     call f % read(object_name, values)
     call f % close()
 
-    ! Transpose the array to get from C to Fortran order
-    values = reshape( &
-      values, &
-      shape=[dims(4), dims(3), dims(2), dims(1)], &
-      order=[4, 3, 2, 1] &
-    )
-
   end subroutine get_hdf5_dataset_real32_4d
 
 end submodule nf_io_hdf5_submodule

test/test_io_hdf5.f90

@@ -42,7 +42,7 @@ program test_io_hdf5
     write(stderr, '(a)') 'HDF5 1-d dataset dims inquiry is correct.. failed'
   end if
 
-  if (.not. all(shape(weights) == [30, 784])) then
+  if (.not. all(shape(weights) == [784, 30])) then
     ok = .false.
     write(stderr, '(a)') 'HDF5 2-d dataset dims inquiry is correct.. failed'
   end if