locally_connected_1d -> locally_connected1d

Author: milancurcic

example/cnn_mnist_1d.f90

@@ -1,7 +1,7 @@
 program cnn_mnist_1d
 
     use nf, only: network, sgd, &
-      input, conv1d, maxpool1d, flatten, dense, reshape, reshape2d, locally_connected_1d, &
+      input, conv1d, maxpool1d, flatten, dense, reshape, reshape2d, locally_connected1d, &
       load_mnist, label_digits, softmax, relu
 
     implicit none
@@ -20,10 +20,10 @@ program cnn_mnist_1d
 
     net = network([ &
       input(784), &
-      reshape2d([28,28]), &
-      locally_connected_1d(filters=8, kernel_size=3, activation=relu()), &
+      reshape2d([28, 28]), &
+      locally_connected1d(filters=8, kernel_size=3, activation=relu()), &
       maxpool1d(pool_size=2), &
-      locally_connected_1d(filters=16, kernel_size=3, activation=relu()), &
+      locally_connected1d(filters=16, kernel_size=3, activation=relu()), &
       maxpool1d(pool_size=2), &
       dense(10, activation=softmax()) &
     ])

src/nf.f90

@@ -12,7 +12,7 @@ module nf
     input, &
     layernorm, &
     linear2d, &
-    locally_connected_1d, &
+    locally_connected1d, &
     maxpool1d, &
     maxpool2d, &
     reshape, &

src/nf/nf_layer_constructors.f90

@@ -16,7 +16,7 @@ module nf_layer_constructors
     flatten, &
     input, &
     linear2d, &
-    locally_connected_1d, &
+    locally_connected1d, &
     maxpool1d, &
     maxpool2d, &
     reshape, &
@@ -212,7 +212,7 @@ module function conv2d(filters, kernel_size, activation) result(res)
         !! Resulting layer instance
     end function conv2d
 
-    module function locally_connected_1d(filters, kernel_size, activation) result(res)
+    module function locally_connected1d(filters, kernel_size, activation) result(res)
       !! 1-d locally connected network constructor
       !!
       !! This layer is for building 1-d locally connected network.
@@ -224,10 +224,10 @@ module function locally_connected_1d(filters, kernel_size, activation) result(re
       !! Example:
       !!
       !! ```
-      !! use nf, only :: locally_connected_1d, layer
-      !! type(layer) :: locally_connected_1d_layer
-      !! locally_connected_1d_layer = dense(filters=32, kernel_size=3)
-      !! locally_connected_1d_layer = dense(filters=32, kernel_size=3, activation='relu')
+      !! use nf, only :: locally_connected1d, layer
+      !! type(layer) :: locally_connected1d_layer
+      !! locally_connected1d_layer = dense(filters=32, kernel_size=3)
+      !! locally_connected1d_layer = dense(filters=32, kernel_size=3, activation='relu')
       !! ```
       integer, intent(in) :: filters
         !! Number of filters in the output of the layer
@@ -237,7 +237,7 @@ module function locally_connected_1d(filters, kernel_size, activation) result(re
         !! Activation function (default sigmoid)
       type(layer) :: res
         !! Resulting layer instance
-    end function locally_connected_1d
+    end function locally_connected1d
 
     module function maxpool1d(pool_size, stride) result(res)
       !! 1-d maxpooling layer constructor.

src/nf/nf_layer_constructors_submodule.f90

@@ -9,7 +9,7 @@
   use nf_input1d_layer, only: input1d_layer
   use nf_input2d_layer, only: input2d_layer
   use nf_input3d_layer, only: input3d_layer
-  use nf_locally_connected_1d_layer, only: locally_connected_1d_layer
+  use nf_locally_connected1d_layer, only: locally_connected1d_layer
   use nf_maxpool1d_layer, only: maxpool1d_layer
   use nf_maxpool2d_layer, only: maxpool2d_layer
   use nf_reshape_layer, only: reshape3d_layer
@@ -74,15 +74,15 @@ module function conv2d(filters, kernel_size, activation) result(res)
 
   end function conv2d
 
-  module function locally_connected_1d(filters, kernel_size, activation) result(res)
+  module function locally_connected1d(filters, kernel_size, activation) result(res)
     integer, intent(in) :: filters
     integer, intent(in) :: kernel_size
     class(activation_function), intent(in), optional :: activation
     type(layer) :: res
 
     class(activation_function), allocatable :: activation_tmp
 
-    res % name = 'locally_connected_1d'
+    res % name = 'locally_connected1d'
 
     if (present(activation)) then
       allocate(activation_tmp, source=activation)
@@ -94,10 +94,10 @@ module function locally_connected_1d(filters, kernel_size, activation) result(re
 
     allocate( &
       res % p, &
-      source=locally_connected_1d_layer(filters, kernel_size, activation_tmp) &
+      source=locally_connected1d_layer(filters, kernel_size, activation_tmp) &
     )
 
-  end function locally_connected_1d
+  end function locally_connected1d
 
 
   module function dense(layer_size, activation) result(res)

src/nf/nf_layer_submodule.f90

@@ -9,7 +9,7 @@
   use nf_input1d_layer, only: input1d_layer
   use nf_input2d_layer, only: input2d_layer
   use nf_input3d_layer, only: input3d_layer
-  use nf_locally_connected_1d_layer, only: locally_connected_1d_layer
+  use nf_locally_connected1d_layer, only: locally_connected1d_layer
   use nf_maxpool1d_layer, only: maxpool1d_layer
   use nf_maxpool2d_layer, only: maxpool2d_layer
   use nf_reshape2d_layer, only: reshape2d_layer
@@ -52,11 +52,11 @@ pure module subroutine backward_1d(self, previous, gradient)
 
       type is(flatten_layer)
 
-        ! Upstream layers permitted: input2d, input3d, conv1d, conv2d, locally_connected_1d, maxpool1d, maxpool2d
+        ! Upstream layers permitted: input2d, input3d, conv1d, conv2d, locally_connected1d, maxpool1d, maxpool2d
         select type(prev_layer => previous % p)
           type is(input2d_layer)
             call this_layer % backward(prev_layer % output, gradient)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % backward(prev_layer % output, gradient)
           type is(maxpool1d_layer)
             call this_layer % backward(prev_layer % output, gradient)
@@ -145,13 +145,13 @@ pure module subroutine backward_2d(self, previous, gradient)
           call this_layer % backward(prev_layer % output, gradient)
         type is(input2d_layer)
           call this_layer % backward(prev_layer % output, gradient)
-        type is(locally_connected_1d_layer)
+        type is(locally_connected1d_layer)
           call this_layer % backward(prev_layer % output, gradient)
         type is(conv1d_layer)
           call this_layer % backward(prev_layer % output, gradient)
       end select
 
-      type is(locally_connected_1d_layer)
+      type is(locally_connected1d_layer)
 
         select type(prev_layer => previous % p)
           type is(maxpool1d_layer)
@@ -160,7 +160,7 @@ pure module subroutine backward_2d(self, previous, gradient)
             call this_layer % backward(prev_layer % output, gradient)
           type is(input2d_layer)
             call this_layer % backward(prev_layer % output, gradient)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % backward(prev_layer % output, gradient)
           type is(conv1d_layer)
             call this_layer % backward(prev_layer % output, gradient)
@@ -173,7 +173,7 @@ pure module subroutine backward_2d(self, previous, gradient)
             call this_layer % backward(prev_layer % output, gradient)
           type is(reshape2d_layer)
             call this_layer % backward(prev_layer % output, gradient)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % backward(prev_layer % output, gradient)
           type is(input2d_layer)
             call this_layer % backward(prev_layer % output, gradient)
@@ -294,13 +294,13 @@ module subroutine forward(self, input)
             call this_layer % forward(prev_layer % output)
         end select
 
-      type is(locally_connected_1d_layer)
+      type is(locally_connected1d_layer)
 
-        ! Upstream layers permitted: input2d, locally_connected_1d, maxpool1d, reshape2d
+        ! Upstream layers permitted: input2d, locally_connected1d, maxpool1d, reshape2d
         select type(prev_layer => input % p)
           type is(input2d_layer)
             call this_layer % forward(prev_layer % output)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % forward(prev_layer % output)
           type is(maxpool1d_layer)
             call this_layer % forward(prev_layer % output)
@@ -312,11 +312,11 @@ module subroutine forward(self, input)
 
       type is(conv1d_layer)
 
-        ! Upstream layers permitted: input2d, locally_connected_1d, maxpool1d, reshape2d
+        ! Upstream layers permitted: input2d, locally_connected1d, maxpool1d, reshape2d
         select type(prev_layer => input % p)
           type is(input2d_layer)
             call this_layer % forward(prev_layer % output)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % forward(prev_layer % output)
           type is(maxpool1d_layer)
             call this_layer % forward(prev_layer % output)
@@ -328,11 +328,11 @@ module subroutine forward(self, input)
 
       type is(maxpool1d_layer)
 
-        ! Upstream layers permitted: input1d, locally_connected_1d, maxpool1d, reshape2d
+        ! Upstream layers permitted: input1d, locally_connected1d, maxpool1d, reshape2d
         select type(prev_layer => input % p)
           type is(input2d_layer)
             call this_layer % forward(prev_layer % output)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % forward(prev_layer % output)
           type is(maxpool1d_layer)
             call this_layer % forward(prev_layer % output)
@@ -358,7 +358,7 @@ module subroutine forward(self, input)
 
       type is(flatten_layer)
 
-        ! Upstream layers permitted: input2d, input3d, conv2d, maxpool1d, maxpool2d, reshape2d, reshape3d, locally_connected_2d
+        ! Upstream layers permitted: input2d, input3d, conv2d, maxpool1d, maxpool2d, reshape2d, reshape3d, locally_connected2d
         select type(prev_layer => input % p)
           type is(input2d_layer)
             call this_layer % forward(prev_layer % output)
@@ -368,7 +368,7 @@ module subroutine forward(self, input)
             call this_layer % forward(prev_layer % output)
           type is(conv2d_layer)
             call this_layer % forward(prev_layer % output)
-          type is(locally_connected_1d_layer)
+          type is(locally_connected1d_layer)
             call this_layer % forward(prev_layer % output)
           type is(maxpool1d_layer)
             call this_layer % forward(prev_layer % output)
@@ -481,7 +481,7 @@ pure module subroutine get_output_2d(self, output)
         allocate(output, source=this_layer % output)
       type is(maxpool1d_layer)
         allocate(output, source=this_layer % output)
-      type is(locally_connected_1d_layer)
+      type is(locally_connected1d_layer)
         allocate(output, source=this_layer % output)
       type is(conv1d_layer)
         allocate(output, source=this_layer % output)
@@ -497,7 +497,7 @@ pure module subroutine get_output_2d(self, output)
         allocate(output, source=this_layer % output)
       class default
         error stop '2-d output can only be read from a input2d, maxpool1d, ' &
-          // 'locally_connected_1d, conv1d, reshape2d, embedding, linear2d, ' &
+          // 'locally_connected1d, conv1d, reshape2d, embedding, linear2d, ' &
           // 'self_attention, or layernorm layer.'
 
     end select
@@ -549,7 +549,7 @@ impure elemental module subroutine init(self, input)
         self % layer_shape = shape(this_layer % output)
       type is(dropout_layer)
         self % layer_shape = shape(this_layer % output)
-      type is(locally_connected_1d_layer)
+      type is(locally_connected1d_layer)
         self % layer_shape = shape(this_layer % output)
       type is(maxpool1d_layer)
         self % layer_shape = shape(this_layer % output)
@@ -611,7 +611,7 @@ elemental module function get_num_params(self) result(num_params)
         num_params = this_layer % get_num_params()
       type is (conv2d_layer)
         num_params = this_layer % get_num_params()
-      type is (locally_connected_1d_layer)
+      type is (locally_connected1d_layer)
         num_params = this_layer % get_num_params()
       type is (maxpool1d_layer)
         num_params = 0
@@ -656,7 +656,7 @@ module function get_params(self) result(params)
         params = this_layer % get_params()
       type is (conv2d_layer)
         params = this_layer % get_params()
-      type is (locally_connected_1d_layer)
+      type is (locally_connected1d_layer)
         params = this_layer % get_params()
       type is (maxpool1d_layer)
         ! No parameters to get.
@@ -701,7 +701,7 @@ module function get_gradients(self) result(gradients)
         gradients = this_layer % get_gradients()
       type is (conv2d_layer)
         gradients = this_layer % get_gradients()
-      type is (locally_connected_1d_layer)
+      type is (locally_connected1d_layer)
         gradients = this_layer % get_gradients()
       type is (maxpool1d_layer)
         ! No gradients to get.
@@ -776,7 +776,7 @@ module subroutine set_params(self, params)
       type is (conv2d_layer)
         call this_layer % set_params(params)
 
-      type is (locally_connected_1d_layer)
+      type is (locally_connected1d_layer)
         call this_layer % set_params(params)
 
       type is (maxpool1d_layer)