Merge pull request #227

This merging is a refactoring of the neural-fortran code.

Instead of the functions get_params and set_params, a function get_params_ptr is implemented. All of the instances of the old two functions have been replaced with the new one.

Author: Riccardo231

src/nf/nf_conv1d_layer.f90

@@ -33,10 +33,8 @@ module nf_conv1d_layer
       procedure :: backward
       procedure :: get_gradients_ptr
       procedure :: get_num_params
-      procedure :: get_params
       procedure :: get_params_ptr
       procedure :: init
-      procedure :: set_params
 
     end type conv1d_layer
 
@@ -89,15 +87,6 @@ pure module function get_num_params(self) result(num_params)
           !! Number of parameters
       end function get_num_params
 
-      module function get_params(self) result(params)
-        !! Return the parameters (weights and biases) of this layer.
-        !! The parameters are ordered as weights first, biases second.
-        class(conv1d_layer), intent(in), target :: self
-          !! A `conv1d_layer` instance
-        real, allocatable :: params(:)
-          !! Parameters to get
-      end function get_params
-  
       module subroutine get_params_ptr(self, w_ptr, b_ptr)
         !! Return pointers to the parameters (weights and biases) of this layer.
         class(conv1d_layer), intent(in), target :: self
@@ -118,14 +107,6 @@ module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
           !! Pointer to the bias gradients
       end subroutine get_gradients_ptr
 
-      module subroutine set_params(self, params)
-        !! Set the parameters of the layer.
-        class(conv1d_layer), intent(in out) :: self
-          !! A `conv1d_layer` instance
-        real, intent(in) :: params(:)
-          !! Parameters to set
-      end subroutine set_params
-  
     end interface
 
 end module nf_conv1d_layer

src/nf/nf_conv1d_layer_submodule.f90

@@ -144,14 +144,6 @@ pure module function get_num_params(self) result(num_params)
     num_params = product(shape(self % kernel)) + size(self % biases)
   end function get_num_params
 
-  module function get_params(self) result(params)
-    class(conv1d_layer), intent(in), target :: self
-    real, allocatable :: params(:)
-    real, pointer :: w_(:) => null()
-    w_(1:size(self % kernel)) => self % kernel
-    params = [ w_, self % biases]
-  end function get_params
-
   module subroutine get_params_ptr(self, w_ptr, b_ptr)
     class(conv1d_layer), intent(in), target :: self
     real, pointer, intent(out) :: w_ptr(:)
@@ -168,19 +160,4 @@ module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
     db_ptr => self % db
   end subroutine get_gradients_ptr
 
-  module subroutine set_params(self, params)
-    class(conv1d_layer), intent(in out) :: self
-    real, intent(in) :: params(:)
-
-    if (size(params) /= self % get_num_params()) then
-      error stop 'conv1d_layer % set_params: Number of parameters does not match'
-    end if
-
-    self % kernel = reshape(params(:product(shape(self % kernel))), shape(self % kernel))
-    associate(n => product(shape(self % kernel)))
-      self % biases = params(n + 1 : n + self % filters)
-    end associate
-
-  end subroutine set_params
-
 end submodule nf_conv1d_layer_submodule

src/nf/nf_conv2d_layer.f90

@@ -34,10 +34,8 @@ module nf_conv2d_layer
     procedure :: backward
     procedure :: get_gradients_ptr
     procedure :: get_num_params
-    procedure :: get_params
     procedure :: get_params_ptr
     procedure :: init
-    procedure :: set_params
 
   end type conv2d_layer
 
@@ -90,15 +88,6 @@ pure module function get_num_params(self) result(num_params)
         !! Number of parameters
     end function get_num_params
 
-    module function get_params(self) result(params)
-      !! Return the parameters (weights and biases) of this layer.
-      !! The parameters are ordered as weights first, biases second.
-      class(conv2d_layer), intent(in), target :: self
-        !! A `conv2d_layer` instance
-      real, allocatable :: params(:)
-        !! Parameters to get
-    end function get_params
-
     module subroutine get_params_ptr(self, w_ptr, b_ptr)
       !! Return pointers to the parameters (weights and biases) of this layer.
       class(conv2d_layer), intent(in), target :: self
@@ -119,14 +108,6 @@ module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
         !! Pointer to the bias gradients
     end subroutine get_gradients_ptr
 
-    module subroutine set_params(self, params)
-      !! Set the parameters of the layer.
-      class(conv2d_layer), intent(in out) :: self
-        !! A `conv2d_layer` instance
-      real, intent(in) :: params(:)
-        !! Parameters to set
-    end subroutine set_params
-
   end interface
 
 end module nf_conv2d_layer

src/nf/nf_conv2d_layer_submodule.f90

@@ -188,22 +188,6 @@ pure module function get_num_params(self) result(num_params)
     num_params = product(shape(self % kernel)) + size(self % biases)
   end function get_num_params
 
-
-  module function get_params(self) result(params)
-    class(conv2d_layer), intent(in), target :: self
-    real, allocatable :: params(:)
-
-    real, pointer :: w_(:) => null()
-
-    w_(1:size(self % kernel)) => self % kernel
-
-    params = [ &
-      w_, &
-      self % biases &
-    ]
-
-  end function get_params
-
 
   module subroutine get_params_ptr(self, w_ptr, b_ptr)
     class(conv2d_layer), intent(in), target :: self
@@ -222,27 +206,4 @@ module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
     db_ptr => self % db
   end subroutine get_gradients_ptr
 
-
-  module subroutine set_params(self, params)
-    class(conv2d_layer), intent(in out) :: self
-    real, intent(in) :: params(:)
-
-    ! Check that the number of parameters is correct.
-    if (size(params) /= self % get_num_params()) then
-      error stop 'conv2d % set_params: Number of parameters does not match'
-    end if
-
-    ! Reshape the kernel.
-    self % kernel = reshape( &
-      params(:product(shape(self % kernel))), &
-      shape(self % kernel) &
-    )
-
-    ! Reshape the biases.
-    associate(n => product(shape(self % kernel)))
-      self % biases = params(n + 1 : n + self % filters)
-    end associate
-
-  end subroutine set_params
-
 end submodule nf_conv2d_layer_submodule

src/nf/nf_dense_layer.f90

@@ -35,10 +35,8 @@ module nf_dense_layer
     procedure :: forward
     procedure :: get_gradients_ptr
     procedure :: get_num_params
-    procedure :: get_params
     procedure :: get_params_ptr
     procedure :: init
-    procedure :: set_params
 
   end type dense_layer
 
@@ -88,15 +86,6 @@ pure module function get_num_params(self) result(num_params)
          !! Number of parameters in this layer
     end function get_num_params
 
-    module function get_params(self) result(params)
-      !! Return the parameters (weights and biases) of this layer.
-      !! The parameters are ordered as weights first, biases second.
-      class(dense_layer), intent(in), target :: self
-        !! Dense layer instance
-      real, allocatable :: params(:)
-        !! Parameters of this layer
-    end function get_params
-
     module subroutine get_params_ptr(self, w_ptr, b_ptr)
       class(dense_layer), intent(in), target :: self
       real, pointer, intent(out) :: w_ptr(:)

src/nf/nf_dense_layer_submodule.f90

@@ -61,22 +61,6 @@ pure module function get_num_params(self) result(num_params)
   end function get_num_params
 
 
-  module function get_params(self) result(params)
-    class(dense_layer), intent(in), target :: self
-    real, allocatable :: params(:)
-
-    real, pointer :: w_(:) => null()
-
-    w_(1:size(self % weights)) => self % weights
-
-    params = [ &
-      w_, &
-      self % biases &
-    ]
-
-  end function get_params
-
-
   module subroutine get_params_ptr(self, w_ptr, b_ptr)
     class(dense_layer), intent(in), target :: self
     real, pointer, intent(out) :: w_ptr(:)
@@ -94,30 +78,6 @@ module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
     db_ptr => self % db
   end subroutine get_gradients_ptr
 
-
-  module subroutine set_params(self, params)
-    class(dense_layer), intent(in out) :: self
-    real, intent(in), target :: params(:)
-
-    real, pointer :: p_(:,:) => null()
-
-    ! check if the number of parameters is correct
-    if (size(params) /= self % get_num_params()) then
-      error stop 'Error: number of parameters does not match'
-    end if
-
-    associate(n => self % input_size * self % output_size)
-      ! reshape the weights
-      p_(1:self % input_size, 1:self % output_size) => params(1 : n)
-      self % weights = p_
-
-      ! reshape the biases
-      self % biases = params(n + 1 : n + self % output_size)
-    end associate
-
-  end subroutine set_params
-
-
   module subroutine init(self, input_shape)
     class(dense_layer), intent(in out) :: self
     integer, intent(in) :: input_shape(:)

src/nf/nf_layer.f90

@@ -160,6 +160,17 @@ module function get_params(self) result(params)
         !! Parameters of this layer
     end function get_params
 
+    module subroutine get_params_ptr(self, w_ptr, b_ptr)
+      !! Returns the parameters of this layer as pointers.
+      !! This is used for layers that have weights and biases.
+      class(layer), intent(in) :: self
+        !! Layer instance
+      real, pointer :: w_ptr(:)
+        !! Pointer to weights of this layer
+      real, pointer :: b_ptr(:)
+        !! Pointer to biases of this layer
+    end subroutine get_params_ptr 
+
     module subroutine set_params(self, params)
       !! Returns the parameters of this layer.
       class(layer), intent(in out) :: self