Removed set_params as well

Author: Riccardo Orsi

src/nf/nf_conv1d_layer.f90

@@ -35,7 +35,6 @@ module nf_conv1d_layer
  procedure :: get_num_params
  procedure :: get_params_ptr
  procedure :: init
- procedure :: set_params
 
  end type conv1d_layer
 
@@ -108,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

@@ -160,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

@@ -36,7 +36,6 @@ module nf_conv2d_layer
  procedure :: get_num_params
  procedure :: get_params_ptr
  procedure :: init
- procedure :: set_params
 
  end type conv2d_layer
 
@@ -109,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

@@ -206,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

@@ -37,7 +37,6 @@ module nf_dense_layer
  procedure :: get_num_params
  procedure :: get_params_ptr
  procedure :: init
- procedure :: set_params
 
  end type dense_layer
 

src/nf/nf_dense_layer_submodule.f90

@@ -78,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_submodule.f90

@@ -691,8 +691,12 @@ module function get_params(self) result(params)
  params = this_layer % get_params()
  type is (embedding_layer)
  params = this_layer % get_params()
+
  type is (layernorm_layer)
- params = this_layer % get_params()
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ allocate(params(size(w_ptr) + size(b_ptr)))
+ params(1:size(w_ptr)) = w_ptr
+ params(size(w_ptr)+1:) = b_ptr
  class default
  error stop 'Unknown layer type.'
  end select
@@ -703,6 +707,8 @@ end function get_params
  module subroutine set_params(self, params)
  class(layer), intent(in out) :: self
  real, intent(in) :: params(:)
+ real, pointer :: w_ptr(:)
+ real, pointer :: b_ptr(:)
 
  ! Check that the number of parameters is correct.
  ! This check will still pass if the size(params) == 0 and the layer is a
@@ -736,37 +742,55 @@ module subroutine set_params(self, params)
  // 'on a zero-parameter layer; nothing to do.'
 
  type is (dense_layer)
- call this_layer % set_params(params)
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ 
+ w_ptr = params(1:size(w_ptr)) 
+ b_ptr = params(size(w_ptr)+1:) 
 
  type is (dropout_layer)
  ! No parameters to set.
  write(stderr, '(a)') 'Warning: calling set_params() ' &
  // 'on a zero-parameter layer; nothing to do.'
 
  type is (conv1d_layer)
- call this_layer % set_params(params)
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ 
+ w_ptr = params(1:size(w_ptr)) 
+ b_ptr = params(size(w_ptr)+1:) 
 
  type is (conv2d_layer)
- call this_layer % set_params(params)
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ 
+ w_ptr = params(1:size(w_ptr)) 
+ b_ptr = params(size(w_ptr)+1:) 
 
  type is (locally_connected2d_layer)
- call this_layer % set_params(params)
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ 
+ w_ptr = params(1:size(w_ptr)) 
+ b_ptr = params(size(w_ptr)+1:) 
 
  type is (maxpool1d_layer)
  ! No parameters to set.
  write(stderr, '(a)') 'Warning: calling set_params() ' &
  // 'on a zero-parameter layer; nothing to do.'
 
  type is (linear2d_layer)
- call this_layer % set_params(params)
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ 
+ w_ptr = params(1:size(w_ptr)) 
+ b_ptr = params(size(w_ptr)+1:) 
 
  type is (self_attention_layer)
  call this_layer % set_params(params)
  type is (embedding_layer)
  call this_layer % set_params(params)
 
  type is (layernorm_layer)
- call this_layer % set_params(params)
+ call this_layer % get_params_ptr(w_ptr, b_ptr)
+ 
+ w_ptr = params(1:size(w_ptr)) 
+ b_ptr = params(size(w_ptr)+1:) 
 
  type is (maxpool2d_layer)
  ! No parameters to set.

src/nf/nf_layernorm.f90

@@ -37,11 +37,9 @@ module nf_layernorm_layer
  procedure :: backward
  procedure :: init
  procedure :: get_num_params
- procedure :: get_params
  procedure :: get_params_ptr
  procedure :: get_gradients
  procedure :: get_gradients_ptr
- procedure :: set_params
  end type layernorm_layer
 
  interface layernorm_layer
@@ -74,12 +72,6 @@ pure module function get_num_params(self) result(num_params)
  end function get_num_params
 
 
- module function get_params(self) result(params)
- class(layernorm_layer), intent(in), target :: self
- real, allocatable :: params(:)
- end function get_params
-
-
  module subroutine get_params_ptr(self, g_ptr, b_ptr)
  class(layernorm_layer), intent(in), target :: self
  real, pointer, intent(out) :: g_ptr(:), b_ptr(:)
@@ -98,9 +90,5 @@ module subroutine get_gradients_ptr(self, dg_ptr, db_ptr)
  end subroutine get_gradients_ptr
 
 
- module subroutine set_params(self, params)
- class(layernorm_layer), intent(in out) :: self
- real, intent(in), target :: params(:)
- end subroutine set_params
  end interface
 end module nf_layernorm_layer

src/nf/nf_layernorm_submodule.f90

@@ -108,14 +108,6 @@ pure module function get_num_params(self) result(num_params)
 
  end function get_num_params
 
-
- module function get_params(self) result(params)
- class(layernorm_layer), intent(in), target :: self
- real, allocatable :: params(:)
- params = [self % gamma, self % beta]
- end function get_params
-
-
  module subroutine get_params_ptr(self, g_ptr, b_ptr)
  class(layernorm_layer), intent(in), target :: self
  real, pointer, intent(out) :: g_ptr(:), b_ptr(:)
@@ -137,19 +129,5 @@ module subroutine get_gradients_ptr(self, dg_ptr, db_ptr)
  dg_ptr => self % d_gamma
  db_ptr => self % d_beta
  end subroutine get_gradients_ptr
-
-
- module subroutine set_params(self, params)
- class(layernorm_layer), intent(in out) :: self
- real, intent(in), target :: params(:)
-
- ! 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
-
- self % gamma = params(1: self % model_dimension)
- self % beta = params(self % model_dimension + 1: 2 * self % model_dimension)
-
- end subroutine set_params
+ 
 end submodule nf_layernorm_layer_submodule

src/nf/nf_linear2d_layer.f90

@@ -24,11 +24,9 @@ module nf_linear2d_layer
  procedure :: forward
  procedure :: init
  procedure :: get_num_params
- procedure :: get_params
  procedure :: get_params_ptr
  procedure :: get_gradients
  procedure :: get_gradients_ptr
- procedure :: set_params
 
  end type linear2d_layer
 
@@ -61,11 +59,6 @@ pure module function get_num_params(self) result(num_params)
  integer :: num_params
  end function get_num_params
 
- module function get_params(self) result(params)
- class(linear2d_layer), intent(in), target :: self
- real, allocatable :: params(:)
- end function get_params
-
  module subroutine get_params_ptr(self, w_ptr, b_ptr)
  class(linear2d_layer), intent(in), target :: self
  real, pointer, intent(out) :: w_ptr(:), b_ptr(:)
@@ -81,9 +74,5 @@ module subroutine get_gradients_ptr(self, dw_ptr, db_ptr)
  real, pointer, intent(out) :: dw_ptr(:), db_ptr(:)
  end subroutine get_gradients_ptr
 
- module subroutine set_params(self, params)
- class(linear2d_layer), intent(in out) :: self
- real, intent(in), target :: params(:)
- end subroutine set_params
  end interface
 end module nf_linear2d_layer