linear2d_layer: fix gradient updates

Author: OneAdder

src/nf/nf_linear2d_layer_submodule.f90

@@ -77,7 +77,7 @@ module function get_params(self) result(params)
 
     real, pointer :: w_(:) => null()
 
-    w_(1:size(self % weights)) => self % weights
+    w_(1: product(shape(self % weights))) => self % weights
 
     params = [ &
       w_, &
@@ -93,7 +93,7 @@ module function get_gradients(self) result(gradients)
 
     real, pointer :: dw_(:) => null()
 
-    dw_(1:size(self % dw)) => self % dw
+    dw_(1: product(shape(self % dw))) => self % dw
 
     gradients = [ &
       dw_, &

test/test_linear2d_layer.f90

@@ -16,6 +16,7 @@ program test_linear2d_layer
 
   call test_linear2d_layer_forward(linear, ok, sample_input)
   call test_linear2d_layer_backward(linear, ok, sample_input, sample_gradient)
+  call test_linear2d_layer_gradient_updates(ok)
 
 contains
   subroutine test_linear2d_layer_forward(linear, ok, input)
@@ -100,4 +101,70 @@ subroutine test_linear2d_layer_backward(linear, ok, input, gradient)
       write(stderr, '(a)') 'backward returned incorrect db values.. failed'
     end if
   end subroutine test_linear2d_layer_backward
+
+  subroutine test_linear2d_layer_gradient_updates(ok)
+    logical, intent(in out) :: ok
+    real :: input(3, 4, 1) = reshape([0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.11, 0.12], [3, 4, 1])
+    real :: gradient(3, 2, 1) = reshape([0.0, 10., 0.2, 3., 0.4, 1.], [3, 2, 1])
+    type(linear2d_layer) :: linear
+
+    integer :: num_parameters
+    real :: parameters(10)
+    real :: expected_parameters(10) = [&
+        0.100000001, 0.100000001, 0.100000001, 0.100000001, 0.100000001, 0.100000001, 0.100000001, 0.100000001,&
+        0.109999999, 0.109999999&
+    ]
+    real :: gradients(10)
+    real :: expected_gradients(10) = [&
+        1.03999996, 4.09999990, 7.15999985, 1.12400007, 0.240000010, 1.56000006, 2.88000011, 2.86399961,&
+        10.1999998, 4.40000010&
+    ]
+    real :: updated_parameters(10)
+    real :: updated_weights(8)
+    real :: updated_biases(2)
+    real :: expected_weights(8) = [&
+        0.203999996, 0.509999990, 0.816000044, 0.212400019, 0.124000005, 0.256000012, 0.388000011, 0.386399955&
+    ]
+    real :: expected_biases(2) = [1.13000000, 0.550000012]
+
+    integer :: i
+
+    linear = linear2d_layer(sequence_length=3, in_features=4, out_features=2, batch_size=1)
+    call linear % init([4])
+    call linear % forward(input)
+    call linear % backward(input, gradient)
+
+    num_parameters = linear % get_num_params()
+    if (num_parameters /= 10) then
+      ok = .false.
+      write(stderr, '(a)') 'incorrect number of parameters.. failed'
+    end if
+
+    parameters = linear % get_params()
+    if (.not. all(parameters.eq.expected_parameters)) then
+      ok = .false.
+      write(stderr, '(a)') 'incorrect parameters.. failed'
+    end if
+
+    gradients = linear % get_gradients()
+    if (.not. all(gradients.eq.expected_gradients)) then
+      ok = .false.
+      write(stderr, '(a)') 'incorrect gradients.. failed'
+    end if
+
+    do i = 1, num_parameters
+      updated_parameters(i) = parameters(i) + 0.1 * gradients(i)
+    end do
+    call linear % set_params(updated_parameters)
+    updated_weights = reshape(linear % weights, shape(expected_weights))
+    if (.not. all(updated_weights.eq.expected_weights)) then
+      ok = .false.
+      write(stderr, '(a)') 'incorrect updated weights.. failed'
+    end if
+    updated_biases = linear % biases
+    if (.not. all(updated_biases.eq.expected_biases)) then
+      ok = .false.
+      write(stderr, '(a)') 'incorrect updated biases.. failed'
+    end if
+  end subroutine test_linear2d_layer_gradient_updates
 end program test_linear2d_layer