Plumbing of linear2d with input2d and linear2d

Author: milancurcic

src/nf/nf_layer_submodule.f90

@@ -64,8 +64,20 @@ pure module subroutine backward_2d(self, previous, gradient)
     real, intent(in) :: gradient(:,:)
 
     ! Backward pass from a 2-d layer downstream currently implemented
-    ! only for dense and flatten layers
-    ! CURRENTLY NO LAYERS, tbd: pull/197 and pull/199
+    ! only for input2d and linear2d layers
+    select type(this_layer => self % p)
+
+      type is(linear2d_layer)
+
+        select type(prev_layer => previous % p)
+          type is(input2d_layer)
+            call this_layer % backward(prev_layer % output, gradient)
+          type is(linear2d_layer)
+            call this_layer % backward(prev_layer % output, gradient)
+        end select
+
+    end select
+
   end subroutine backward_2d
 
 
@@ -119,12 +131,6 @@ pure module subroutine backward_3d(self, previous, gradient)
             call this_layer % backward(prev_layer % output, gradient)
         end select
 
-!      type is(linear2d_layer)
-!        select type(prev_layer => previous % p)
-!          type is(input3d_layer)
-!            call this_layer % backward(prev_layer % output, gradient)
-!        end select
-
     end select
 
   end subroutine backward_3d
@@ -207,13 +213,15 @@ pure module subroutine forward(self, input)
             call this_layer % forward(prev_layer % output)
         end select
 
-!      type is(linear2d_layer)
-!        select type(prev_layer => input % p)
-!          type is(input3d_layer)
-!            call this_layer % forward(prev_layer % output)
-!          type is(linear2d_layer)
-!            call this_layer % forward(prev_layer % output)
-!        end select
+      type is(linear2d_layer)
+
+        ! Upstream layers permitted: input2d, linear2d
+        select type(prev_layer => input % p)
+          type is(input2d_layer)
+            call this_layer % forward(prev_layer % output)
+          type is(linear2d_layer)
+            call this_layer % forward(prev_layer % output)
+        end select
 
     end select
 
@@ -250,8 +258,10 @@ pure module subroutine get_output_2d(self, output)
 
       type is(input2d_layer)
         allocate(output, source=this_layer % output)
+      type is(linear2d_layer)
+        allocate(output, source=this_layer % output)
       class default
-        error stop '1-d output can only be read from an input1d, dense, or flatten layer.'
+        error stop '2-d output can only be read from an input2d or linear2d layer.'
 
     end select
 
@@ -347,8 +357,8 @@ elemental module function get_num_params(self) result(num_params)
         num_params = 0
       type is (reshape3d_layer)
         num_params = 0
-!      type is (linear2d_layer)
-!        num_params = this_layer % get_num_params()
+      type is (linear2d_layer)
+        num_params = this_layer % get_num_params()
       class default
         error stop 'Unknown layer type.'
     end select
@@ -376,8 +386,8 @@ module function get_params(self) result(params)
         ! No parameters to get.
       type is (reshape3d_layer)
         ! No parameters to get.
-!      type is (linear2d_layer)
-!        params = this_layer % get_params()
+      type is (linear2d_layer)
+        params = this_layer % get_params()
       class default
         error stop 'Unknown layer type.'
     end select
@@ -405,8 +415,8 @@ module function get_gradients(self) result(gradients)
         ! No gradients to get.
       type is (reshape3d_layer)
         ! No gradients to get.
-!      type is (linear2d_layer)
-!        gradients = this_layer % get_gradients()
+      type is (linear2d_layer)
+        gradients = this_layer % get_gradients()
       class default
         error stop 'Unknown layer type.'
     end select
@@ -454,6 +464,9 @@ module subroutine set_params(self, params)
       type is (conv2d_layer)
         call this_layer % set_params(params)
 
+      type is (linear2d_layer)
+        call this_layer % set_params(params)
+
       type is (maxpool2d_layer)
         ! No parameters to set.
         write(stderr, '(a)') 'Warning: calling set_params() ' &
@@ -472,8 +485,6 @@ module subroutine set_params(self, params)
           class default
         error stop 'Unknown layer type.'
 
-!    type is (linear2d_layer)
-!        call this_layer % set_params(params)
     end select
 
   end subroutine set_params

src/nf/nf_network_submodule.f90

@@ -157,8 +157,8 @@ module subroutine backward(self, output, loss)
 
           type is(reshape3d_layer)
             call self % layers(n) % backward(self % layers(n - 1), next_layer % gradient)
-!          type is(linear2d_layer)
-!            call self % layers(n) % backward(self % layers(n - 1), next_layer % gradient)
+          type is(linear2d_layer)
+            call self % layers(n) % backward(self % layers(n - 1), next_layer % gradient)
         end select
       end if