Remove get_gradients from network, layer, dense, conv1d, conv2d

Author: milancurcic

src/nf/nf_conv1d_layer.f90

@@ -31,7 +31,6 @@ module nf_conv1d_layer
 
       procedure :: forward
       procedure :: backward
-      procedure :: get_gradients
       procedure :: get_gradients_ptr
       procedure :: get_num_params
       procedure :: get_params
@@ -109,15 +108,6 @@ module subroutine get_params_ptr(self, w_ptr, b_ptr)
           !! Pointer to the biases
       end subroutine get_params_ptr
 
-      module function get_gradients(self) result(gradients)
-        !! Return the gradients of this layer.
-        !! The gradients are ordered as weights first, biases second.
-        class(conv1d_layer), intent(in), target :: self
-          !! A `conv1d_layer` instance
-        real, allocatable :: gradients(:)
-          !! Gradients to get
-      end function get_gradients
-  
       module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
         !! Return pointers to the gradients of this layer.
         class(conv1d_layer), intent(in), target :: self

src/nf/nf_conv1d_layer_submodule.f90

@@ -160,14 +160,6 @@ module subroutine get_params_ptr(self, w_ptr, b_ptr)
     b_ptr => self % biases
   end subroutine get_params_ptr
 
-  module function get_gradients(self) result(gradients)
-    class(conv1d_layer), intent(in), target :: self
-    real, allocatable :: gradients(:)
-    real, pointer :: dw_(:) => null()
-    dw_(1:size(self % dw)) => self % dw
-    gradients = [ dw_, self % db ]
-  end function get_gradients
-
   module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
     class(conv1d_layer), intent(in), target :: self
     real, pointer, intent(out) :: dw_ptr(:)

src/nf/nf_conv2d_layer.f90

@@ -32,7 +32,6 @@ module nf_conv2d_layer
 
     procedure :: forward
     procedure :: backward
-    procedure :: get_gradients
     procedure :: get_gradients_ptr
     procedure :: get_num_params
     procedure :: get_params
@@ -110,15 +109,6 @@ module subroutine get_params_ptr(self, w_ptr, b_ptr)
         !! Pointer to the biases
     end subroutine get_params_ptr
 
-    module function get_gradients(self) result(gradients)
-      !! Return the gradients of this layer.
-      !! The gradients are ordered as weights first, biases second.
-      class(conv2d_layer), intent(in), target :: self
-        !! A `conv2d_layer` instance
-      real, allocatable :: gradients(:)
-        !! Gradients to get
-    end function get_gradients
-
     module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
       !! Return pointers to the gradients of this layer.
       class(conv2d_layer), intent(in), target :: self

src/nf/nf_conv2d_layer_submodule.f90

@@ -214,22 +214,6 @@ module subroutine get_params_ptr(self, w_ptr, b_ptr)
   end subroutine get_params_ptr
 
 
-  module function get_gradients(self) result(gradients)
-    class(conv2d_layer), intent(in), target :: self
-    real, allocatable :: gradients(:)
-
-    real, pointer :: dw_(:) => null()
-
-    dw_(1:size(self % dw)) => self % dw
-
-    gradients = [ &
-      dw_, &
-      self % db &
-    ]
-
-  end function get_gradients
-
-
   module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
     class(conv2d_layer), intent(in), target :: self
     real, pointer, intent(out) :: dw_ptr(:)

src/nf/nf_dense_layer.f90

@@ -33,7 +33,6 @@ module nf_dense_layer
 
     procedure :: backward
     procedure :: forward
-    procedure :: get_gradients
     procedure :: get_gradients_ptr
     procedure :: get_num_params
     procedure :: get_params
@@ -104,15 +103,6 @@ module subroutine get_params_ptr(self, w_ptr, b_ptr)
       real, pointer, intent(out) :: b_ptr(:)
     end subroutine get_params_ptr
 
-    module function get_gradients(self) result(gradients)
-      !! Return the gradients of this layer.
-      !! The gradients are ordered as weights first, biases second.
-      class(dense_layer), intent(in), target :: self
-        !! Dense layer instance
-      real, allocatable :: gradients(:)
-        !! Gradients of this layer
-    end function get_gradients
-
     module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
       class(dense_layer), intent(in), target :: self
       real, pointer, intent(out) :: dw_ptr(:)

src/nf/nf_dense_layer_submodule.f90

@@ -86,22 +86,6 @@ module subroutine get_params_ptr(self, w_ptr, b_ptr)
   end subroutine get_params_ptr
 
 
-  module function get_gradients(self) result(gradients)
-    class(dense_layer), intent(in), target :: self
-    real, allocatable :: gradients(:)
-
-    real, pointer :: dw_(:) => null()
-
-    dw_(1:size(self % dw)) => self % dw
-
-    gradients = [ &
-      dw_, &
-      self % db &
-    ]
-
-  end function get_gradients
-
-
   module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
     class(dense_layer), intent(in), target :: self
     real, pointer, intent(out) :: dw_ptr(:)

src/nf/nf_layer.f90

@@ -29,7 +29,6 @@ module nf_layer
     procedure :: forward
     procedure :: get_num_params
     procedure :: get_params
-    procedure :: get_gradients
     procedure :: set_params
     procedure :: init
     procedure :: print_info
@@ -161,14 +160,6 @@ module function get_params(self) result(params)
         !! Parameters of this layer
     end function get_params
 
-    module function get_gradients(self) result(gradients)
-      !! Returns the gradients of this layer.
-      class(layer), intent(in) :: self
-        !! Layer instance
-      real, allocatable :: gradients(:)
-        !! Gradients of this layer
-    end function get_gradients
-
     module subroutine set_params(self, params)
       !! Returns the parameters of this layer.
       class(layer), intent(in out) :: self

src/nf/nf_layer_submodule.f90

@@ -682,50 +682,6 @@ module function get_params(self) result(params)
 
   end function get_params
 
-  module function get_gradients(self) result(gradients)
-    class(layer), intent(in) :: self
-    real, allocatable :: gradients(:)
-
-    select type (this_layer => self % p)
-      type is (input1d_layer)
-        ! No gradients to get.
-      type is (input2d_layer)
-        ! No gradients to get.
-      type is (input3d_layer)
-        ! No gradients to get.
-      type is (dense_layer)
-        gradients = this_layer % get_gradients()
-      type is (dropout_layer)
-        ! No gradients to get.
-      type is (conv1d_layer)
-        gradients = this_layer % get_gradients()
-      type is (conv2d_layer)
-        gradients = this_layer % get_gradients()
-      type is (locally_connected1d_layer)
-        gradients = this_layer % get_gradients()
-      type is (maxpool1d_layer)
-        ! No gradients to get.
-      type is (maxpool2d_layer)
-        ! No gradients to get.
-      type is (flatten_layer)
-        ! No gradients to get.
-      type is (reshape2d_layer)
-        ! No parameters to get.
-      type is (reshape3d_layer)
-        ! No gradients to get.
-      type is (linear2d_layer)
-        gradients = this_layer % get_gradients()
-      type is (self_attention_layer)
-        gradients = this_layer % get_gradients()
-      type is (embedding_layer)
-        gradients = this_layer % get_gradients()
-      type is (layernorm_layer)
-        gradients = this_layer % get_gradients()
-      class default
-        error stop 'Unknown layer type.'
-    end select
-
-  end function get_gradients
 
   module subroutine set_params(self, params)
     class(layer), intent(in out) :: self

src/nf/nf_network.f90

@@ -21,7 +21,6 @@ module nf_network
   contains
 
     procedure :: backward
-    procedure :: get_gradients
     procedure :: get_num_params
     procedure :: get_params
     procedure :: print_info
@@ -216,7 +215,6 @@ module integer function get_num_params(self)
       !! Network instance
     end function get_num_params
 
-
     module function get_params(self) result(params)
       !! Get the network parameters (weights and biases).
       class(network), intent(in) :: self
@@ -225,13 +223,6 @@ module function get_params(self) result(params)
         !! Network parameters to get
     end function get_params
 
-    module function get_gradients(self) result(gradients)
-      class(network), intent(in) :: self
-        !! Network instance
-      real, allocatable :: gradients(:)
-        !! Network gradients to set
-    end function get_gradients
-
     module subroutine set_params(self, params)
       !! Set the network parameters (weights and biases).
       class(network), intent(in out) :: self

src/nf/nf_network_submodule.f90

@@ -524,25 +524,6 @@ module function get_params(self) result(params)
 
   end function get_params
 
-  module function get_gradients(self) result(gradients)
-    class(network), intent(in) :: self
-    real, allocatable :: gradients(:)
-    integer :: n, nstart, nend
-
-    allocate(gradients(self % get_num_params()))
-
-    nstart = 1
-    do n = 1, size(self % layers)
-
-      if (self % layers(n) % get_num_params() < 1) cycle
-
-      nend = nstart + self % layers(n) % get_num_params() - 1
-      gradients(nstart:nend) = self % layers(n) % get_gradients()
-      nstart = nend + 1
-    end do
-
-  end function get_gradients
-
 
   module subroutine set_params(self, params)
     class(network), intent(in out) :: self