bug fixes; integrating reshape_generalized in environment

Author: Riccardo231

example/cnn_mnist_1d.f90

@@ -1,7 +1,7 @@
 program cnn_mnist
 
     use nf, only: network, sgd, &
-      input, conv2d, maxpool2d, flatten, dense, reshape, locally_connected_1d, &
+      input, conv2d, maxpool2d, flatten, dense, reshape, reshape_generalized, locally_connected_1d, &
       load_mnist, label_digits, softmax, relu
 
     implicit none
@@ -20,8 +20,11 @@ program cnn_mnist
 
     net = network([ &
       input(784), &
-      reshape([1,28,28]), &
-      locally_connected_1d(filters=8, kernel_size=2, activation=relu()), &
+      reshape([1, 28, 28]), &
+      conv2d(filters=8, kernel_size=3, activation=relu()), &
+      maxpool2d(pool_size=2), &
+      conv2d(filters=16, kernel_size=3, activation=relu()), &
+      maxpool2d(pool_size=2), &
       dense(10, activation=softmax()) &
     ])
 

src/nf/nf_layer_constructors.f90

@@ -194,7 +194,7 @@ module function reshape(output_shape) result(res)
     end function reshape
 
     module function reshape_generalized(output_shape) result(res)
-      integer, intent(in) :: output_shape
+      integer, intent(in) :: output_shape(:)
       type(layer) :: res
 
     end function reshape_generalized

src/nf/nf_layer_submodule.f90

@@ -9,6 +9,7 @@
   use nf_locally_connected_1d_layer, only: locally_connected_1d_layer
   use nf_maxpool2d_layer, only: maxpool2d_layer
   use nf_reshape_layer, only: reshape3d_layer
+  use nf_reshape_layer_generalized, only: reshape_generalized_layer
   use nf_optimizers, only: optimizer_base_type
 
 contains
@@ -293,6 +294,8 @@ elemental module function get_num_params(self) result(num_params)
         num_params = 0
       type is (reshape3d_layer)
         num_params = 0
+      type is (reshape_generalized_layer)
+        num_params = 0
       class default
         error stop 'Unknown layer type.'
     end select
@@ -318,6 +321,8 @@ module function get_params(self) result(params)
         ! No parameters to get.
       type is (reshape3d_layer)
         ! No parameters to get.
+      type is (reshape_generalized_layer)
+        ! No parameters to get.
       class default
         error stop 'Unknown layer type.'
     end select
@@ -343,6 +348,8 @@ module function get_gradients(self) result(gradients)
         ! No gradients to get.
       type is (reshape3d_layer)
         ! No gradients to get.
+      type is (reshape_generalized_layer)
+        ! No gradients to get.
       class default
         error stop 'Unknown layer type.'
     end select
@@ -399,7 +406,12 @@ module subroutine set_params(self, params)
         ! No parameters to set.
         write(stderr, '(a)') 'Warning: calling set_params() ' &
           // 'on a zero-parameter layer; nothing to do.'
-
+      
+      type is (reshape_generalized_layer)
+        ! No parameters to set.
+        write(stderr, '(a)') 'Warning: calling set_params() ' &
+          // 'on a zero-parameter layer; nothing to do.'
+        
           class default
         error stop 'Unknown layer type.'
     end select

src/nf/nf_network_submodule.f90

@@ -9,7 +9,7 @@
   use nf_maxpool2d_layer, only: maxpool2d_layer
   use nf_reshape_layer, only: reshape3d_layer
   use nf_layer, only: layer
-  use nf_layer_constructors, only: conv2d, dense, flatten, input, locally_connected_1d, maxpool2d, reshape
+  use nf_layer_constructors, only: conv2d, dense, flatten, input, locally_connected_1d, maxpool2d, reshape, reshape_generalized
   use nf_loss, only: quadratic
   use nf_optimizers, only: optimizer_base_type, sgd
   use nf_parallel, only: tile_indices

src/nf/nf_reshape_generalized_submodule.f90

@@ -11,7 +11,7 @@ pure module function reshape_layer_cons(output_shape) result(res)
     type(reshape_generalized_layer) :: res
 
     ! Check if output_shape is scalar (size 1)
-    if (size(output_shape) == 1) then
+    if (size(output_shape) == 0) then
         allocate(res % output_shape(1))
         res % output_shape = output_shape
     else