Read Keras layer names

Author: milancurcic

src/nf/nf_keras.f90

@@ -11,7 +11,7 @@ module nf_keras
   type :: keras_layer
     !! Intermediate container to convey the Keras layer information
     !! to neural-fortran layer constructors.
-    character(:), allocatable :: type
+    character(:), allocatable :: class
     character(:), allocatable :: name
     character(:), allocatable :: activation
     integer, allocatable :: num_elements(:)

src/nf/nf_keras_submodule.f90

@@ -39,30 +39,31 @@ module function get_keras_h5_layers(filename) result(res)
       call json % get_child(layers_json, n, layer_json)
 
       ! Get type of layer as a string
-      call json % get(layer_json, 'class_name', res(n) % type)
+      call json % get(layer_json, 'class_name', res(n) % class)
 
       ! Get pointer to the layer config
       call json % get(layer_json, 'config', layer_config_json)
 
+      ! Get layer name
+      call json % get(layer_config_json, 'name', res(n) % name)
+
       ! Get size of layer and activation if applicable;
       ! Instantiate neural-fortran layers at this time.
-      if (res(n) % type == 'InputLayer') then
-        
-        call json % get(layer_config_json, 'batch_input_shape', tmp_array)
-        res(n) % num_elements = [tmp_array(2)]
-      
-      else if (res(n) % type == 'Dense') then
-        
-        call json % get(layer_config_json, 'units',  num_elements, found)
-        res(n) % num_elements = [num_elements]
+      select case(res(n) % class)
 
-        call json % get(layer_config_json, 'activation', res(n) % activation)
+        case('InputLayer')
+          call json % get(layer_config_json, 'batch_input_shape', tmp_array)
+          res(n) % num_elements = [tmp_array(2)]
 
-      else
-        
-        error stop 'This layer is not supported'
+        case('Dense')
+          call json % get(layer_config_json, 'units',  num_elements, found)
+          res(n) % num_elements = [num_elements]
+          call json % get(layer_config_json, 'activation', res(n) % activation)
 
-      end if
+        case default
+          error stop 'This Keras layer is not supported'
+
+      end select
 
     end do layers
 

test/test_keras_read_model.f90

@@ -29,7 +29,7 @@ program test_keras_read_model
     write(stderr, '(a)') 'Keras dense MNIST model has 3 layers.. failed'
   end if
 
-  if (keras_layers(1) % type /= 'InputLayer') then
+  if (keras_layers(1) % class /= 'InputLayer') then
     ok = .false.
     write(stderr, '(a)') 'Keras first layer should be InputLayer.. failed'
   end if
@@ -45,7 +45,7 @@ program test_keras_read_model
       'Keras first layer activation should not be allocated.. failed'
   end if
 
-  if (.not. keras_layers(2) % type == 'Dense') then
+  if (.not. keras_layers(2) % class == 'Dense') then
     ok = .false.
     write(stderr, '(a)') &
       'Keras second and third layers should be dense.. failed'