linear2d_layer: remove redundant constructor args

Author: OneAdder

example/linear2d.f90

@@ -8,12 +8,12 @@ program linear2d_example
     [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], &
     [3, 4])
   real :: y(3) = [0.12, 0.1, 0.3]
-  integer, parameter :: num_iterations = 500
+  integer, parameter :: num_iterations = 5
   integer :: n
 
   net = network([ &
     input(3, 4), &
-    linear2d(3, 4, 1), &
+    linear2d(3, 1), &
     flatten() &
   ])
 

src/nf/nf_layer_constructors.f90

@@ -185,8 +185,8 @@ module function reshape(output_shape) result(res)
         !! Resulting layer instance
     end function reshape
 
-    module function linear2d(sequence_length, in_features, out_features) result(res)
-      integer, intent(in) :: sequence_length, in_features, out_features
+    module function linear2d(sequence_length, out_features) result(res)
+      integer, intent(in) :: sequence_length, out_features
       type(layer) :: res
     end function linear2d
 

src/nf/nf_layer_constructors_submodule.f90

@@ -150,13 +150,13 @@ module function reshape(output_shape) result(res)
 
   end function reshape
 
-  module function linear2d(sequence_length, in_features, out_features) result(res)
-    integer, intent(in) :: sequence_length, in_features, out_features
+  module function linear2d(sequence_length, out_features) result(res)
+    integer, intent(in) :: sequence_length, out_features
     type(layer) :: res
 
     res % name = 'linear2d'
     res % layer_shape = [sequence_length, out_features]
-    allocate(res % p, source=linear2d_layer(sequence_length, in_features, out_features))
+    allocate(res % p, source=linear2d_layer(out_features))
   end function linear2d
 
 end submodule nf_layer_constructors_submodule

src/nf/nf_linear2d_layer.f90

@@ -31,10 +31,8 @@ module nf_linear2d_layer
   end type linear2d_layer
 
   interface linear2d_layer
-    module function linear2d_layer_cons(&
-        sequence_length, in_features, out_features&
-    ) result(res)
-      integer, intent(in) :: sequence_length, in_features, out_features
+    module function linear2d_layer_cons(out_features) result(res)
+      integer, intent(in) :: out_features
       type(linear2d_layer) :: res
     end function linear2d_layer_cons
   end interface linear2d_layer

src/nf/nf_linear2d_layer_submodule.f90

@@ -2,21 +2,23 @@
   use nf_base_layer, only: base_layer
   implicit none
 contains
-  module function linear2d_layer_cons(&
-      sequence_length, in_features, out_features&
-  ) result(res)
-    integer, intent(in) :: sequence_length, in_features, out_features
+  module function linear2d_layer_cons(out_features) result(res)
+    integer, intent(in) :: out_features
     type(linear2d_layer) :: res
 
-    res % in_features = in_features
     res % out_features = out_features
-    res % sequence_length = sequence_length
   end function linear2d_layer_cons
 
   module subroutine init(self, input_shape)
     class(linear2d_layer), intent(in out) :: self
     integer, intent(in) :: input_shape(:)
 
+    if (size(input_shape) /= 2) then
+      error stop "Linear2D Layer accepts 2D input"
+    end if
+    self % sequence_length = input_shape(1)
+    self % in_features = input_shape(2)
+
     allocate(self % output(self % sequence_length, self % out_features))
     allocate(self % gradient(self % sequence_length, self % in_features))
 

test/test_linear2d_layer.f90

@@ -6,12 +6,12 @@ program test_linear2d_layer
   logical :: ok = .true.
   real :: sample_input(3, 4) = reshape(&
       [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2],&
-      [3, 4]) ! first batch are 0.1, second 0.2
+      [3, 4])
   real :: sample_gradient(3, 1) = reshape([2., 2., 3.], [3, 1])
   type(linear2d_layer) :: linear
 
-  linear = linear2d_layer(sequence_length=3, in_features=4, out_features=1)
-  call linear % init([4])
+  linear = linear2d_layer(out_features=1)
+  call linear % init([3, 4])
 
   call test_linear2d_layer_forward(linear, ok, sample_input)
   call test_linear2d_layer_backward(linear, ok, sample_input, sample_gradient)
@@ -131,8 +131,8 @@ subroutine test_linear2d_layer_gradient_updates(ok)
 
     integer :: i
 
-    linear = linear2d_layer(sequence_length=3, in_features=4, out_features=2, batch_size=1)
-    call linear % init([4])
+    linear = linear2d_layer(out_features=2)
+    call linear % init([3, 4])
     call linear % forward(input)
     call linear % backward(input, gradient)