Rename functions for consistency

Author: milancurcic

CMakeLists.txt

@@ -106,7 +106,7 @@ string(REGEX REPLACE "^ | $" "" LIBS "${LIBS}")
 
 # tests
 enable_testing()
-foreach(execid input1d_layer input3d_layer dense_layer conv2d_layer maxpool2d_layer flatten_layer dense_network conv2d_network)
+foreach(execid input1d_layer input3d_layer dense_layer conv2d_layer maxpool2d_layer flatten_layer dense_network conv2d_network keras_read_model)
   add_executable(test_${execid} test/test_${execid}.f90)
   target_link_libraries(test_${execid} neural ${LIBS})
   add_test(test_${execid} bin/test_${execid})

src/nf/io/nf_io_hdf5.f90

@@ -5,11 +5,11 @@ module nf_io_hdf5
   implicit none
 
   private
-  public :: get_h5_attribute_string
+  public :: get_hdf5_attribute_string
 
   interface
 
-    module function get_h5_attribute_string( &
+    module function get_hdf5_attribute_string( &
       filename, object_name, attribute_name) result(res)
       character(*), intent(in) :: filename
         !! HDF5 file name
@@ -18,7 +18,7 @@ module function get_h5_attribute_string( &
       character(*), intent(in) :: attribute_name
         !! Name of the attribute to read
       character(:), allocatable :: res
-    end function get_h5_attribute_string
+    end function get_hdf5_attribute_string
 
   end interface
 

src/nf/io/nf_io_hdf5_submodule.f90

@@ -9,7 +9,7 @@
 
 contains
 
-  module function get_h5_attribute_string( &
+  module function get_hdf5_attribute_string( &
     filename, object_name, attribute_name) result(res)
 
     character(*), intent(in) :: filename
@@ -41,6 +41,6 @@ module function get_h5_attribute_string( &
 
     res = string(:index(string, c_null_char) - 1)
 
-  end function get_h5_attribute_string
+  end function get_hdf5_attribute_string
 
 end submodule nf_io_hdf5_submodule

src/nf/nf_keras_submodule.f90

@@ -1,7 +1,7 @@
 submodule(nf_keras) nf_keras_submodule
 
   use json_module, only: json_core, json_value
-  use nf_io_hdf5, only: get_h5_attribute_string
+  use nf_io_hdf5, only: get_hdf5_attribute_string
 
   implicit none
 
@@ -21,7 +21,9 @@ module function get_keras_h5_layers(filename) result(res)
     integer :: n, num_layers, num_elements
     logical :: found
 
-    model_config_string = get_h5_attribute_string(filename, '.', 'model_config')
+    model_config_string = get_hdf5_attribute_string( &
+      filename, '.', 'model_config' &
+    )
 
     call json % parse(model_config_json, model_config_string)
     call json % get(model_config_json, 'config.layers', layers_json)

test/test_io_hdf5.f90

@@ -2,7 +2,7 @@ program test_io_hdf5
 
   use iso_fortran_env, only: stderr => error_unit
   use nf_datasets, only: download_and_unpack, keras_model_dense_mnist_url
-  use nf_io_hdf5, only: get_h5_attribute_string
+  use nf_io_hdf5, only: get_hdf5_attribute_string
 
   implicit none
 
@@ -14,7 +14,7 @@ program test_io_hdf5
   inquire(file=test_data_path, exist=file_exists)
   if (.not. file_exists) call download_and_unpack(keras_model_dense_mnist_url)
 
-  attr = get_h5_attribute_string(test_data_path, '.', 'backend')
+  attr = get_hdf5_attribute_string(test_data_path, '.', 'backend')
 
   if (.not. attr == 'tensorflow') then
     ok = .false.

test/test_parse_keras_model.f90

@@ -1,4 +1,4 @@
-program test_parse_keras_model
+program test_keras_read_model
 
   use iso_fortran_env, only: stderr => error_unit
   use nf_datasets, only: download_and_unpack, keras_model_dense_mnist_url
@@ -52,10 +52,10 @@ program test_parse_keras_model
   end if
 
   if (ok) then
-    print '(a)', 'test_parse_keras_model: All tests passed.'
+    print '(a)', 'test_keras_read_model: All tests passed.'
   else
-    write(stderr, '(a)') 'test_parse_keras_model: One or more tests failed.'
+    write(stderr, '(a)') 'test_keras_read_model: One or more tests failed.'
     stop 1
   end if
 
-end program test_parse_keras_model
+end program test_keras_read_model