Poolings finished

Author: Riccardo Orsi

CMakeLists.txt

@@ -21,8 +21,6 @@ add_library(neural-fortran
   src/nf/nf_avgpool1d_layer_submodule.f90
   src/nf/nf_avgpool2d_layer.f90
   src/nf/nf_avgpool2d_layer_submodule.f90
-  src/nf/nf_avgpool3d_layer.f90
-  src/nf/nf_avgpool3d_layer_submodule.f90
   src/nf/nf_base_layer.f90
   src/nf/nf_conv1d_layer.f90
   src/nf/nf_conv1d_layer_submodule.f90
@@ -61,8 +59,6 @@ add_library(neural-fortran
   src/nf/nf_maxpool1d_layer_submodule.f90
   src/nf/nf_maxpool2d_layer.f90
   src/nf/nf_maxpool2d_layer_submodule.f90
-  src/nf/nf_maxpool3d_layer.f90
-  src/nf/nf_maxpool3d_layer_submodule.f90
   src/nf/nf_metrics.f90
   src/nf/nf_multihead_attention.f90
   src/nf/nf_multihead_attention_submodule.f90

src/nf.f90

@@ -5,7 +5,6 @@ module nf
   use nf_layer_constructors, only: &
     avgpool1d, &
     avgpool2d, &
-    avgpool3d, &
     conv1d, &
     conv2d, &
     dense, &
@@ -18,7 +17,6 @@ module nf
     locally_connected1d, &
     maxpool1d, &
     maxpool2d, &
-    maxpool3d, &
     reshape, &
     self_attention
   use nf_loss, only: mse, quadratic

src/nf/nf_avgpool3d_layer.f90

@@ -11,7 +11,6 @@ module nf_layer_constructors
   public :: &
     avgpool1d, &
     avgpool2d, &
-    avgpool3d, &
     conv1d, &
     conv2d, &
     dense, &
@@ -22,7 +21,6 @@ module nf_layer_constructors
     locally_connected1d, &
     maxpool1d, &
     maxpool2d, &
-    maxpool3d, &
     reshape, &
     self_attention, &
     embedding, &
@@ -227,28 +225,6 @@ module function avgpool2d(pool_size, stride) result(res)
         !! Resulting layer instance
     end function avgpool2d
 
-    module function avgpool3d(pool_size, stride) result(res)
-      !! 3-d avgpooling layer constructor.
-      !!
-      !! This layer is for downscaling other layers, typically `conv3d`.
-      !!
-      !! Example:
-      !!
-      !! ```
-      !! use nf, only :: avgpool3d, layer
-      !! type(layer) :: avgpool3d_layer
-      !! avgpool3d_layer = avgpool3d(pool_size=2)
-      !! avgpool3d_layer = avgpool3d(pool_size=2, stride=3)
-      !! ```
-      integer, intent(in) :: pool_size
-        !! Width of the pooling window, commonly 2
-      integer, intent(in), optional :: stride
-        !! Stride of the pooling window, commonly equal to `pool_size`;
-        !! Defaults to `pool_size` if omitted.
-      type(layer) :: res
-        !! Resulting layer instance
-    end function avgpool3d
-
     module function conv1d(filters, kernel_size, activation) result(res)
       !! 1-d convolutional layer constructor.
       !!
@@ -373,29 +349,7 @@ module function maxpool2d(pool_size, stride) result(res)
       type(layer) :: res
         !! Resulting layer instance
     end function maxpool2d
-
-    module function maxpool3d(pool_size, stride) result(res)
-      !! 3-d maxpooling layer constructor.
-      !!
-      !! This layer is for downscaling other layers, typically `conv3d`.
-      !!
-      !! Example:
-      !!
-      !! ```
-      !! use nf, only :: maxpool3d, layer
-      !! type(layer) :: maxpool3d_layer
-      !! maxpool3d_layer = maxpool3d(pool_size=2)
-      !! maxpool3d_layer = maxpool3d(pool_size=2, stride=3)
-      !! ```
-      integer, intent(in) :: pool_size
-        !! Width of the pooling window, commonly 2
-      integer, intent(in), optional :: stride
-        !! Stride of the pooling window, commonly equal to `pool_size`;
-        !! Defaults to `pool_size` if omitted.
-      type(layer) :: res
-        !! Resulting layer instance
-    end function maxpool3d
-
+  
     module function linear2d(out_features) result(res)
       !! Rank-2 (sequence_length, out_features) linear layer constructor.
       !! sequence_length is determined at layer initialization, based on the

src/nf/nf_avgpool3d_layer_submodule.f90

@@ -3,7 +3,6 @@
   use nf_layer, only: layer
   use nf_avgpool1d_layer, only: avgpool1d_layer
   use nf_avgpool2d_layer, only: avgpool2d_layer
-  use nf_avgpool3d_layer, only: avgpool3d_layer
   use nf_conv1d_layer, only: conv1d_layer
   use nf_conv2d_layer, only: conv2d_layer
   use nf_dense_layer, only: dense_layer
@@ -15,7 +14,6 @@
   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_maxpool3d_layer, only: maxpool3d_layer
   use nf_reshape2d_layer, only: reshape2d_layer
   use nf_reshape3d_layer, only: reshape3d_layer
   use nf_linear2d_layer, only: linear2d_layer
@@ -200,36 +198,6 @@ module function avgpool2d(pool_size, stride) result(res)
 
   end function avgpool2d
 
-
-  module function avgpool3d(pool_size, stride) result(res)
-    integer, intent(in) :: pool_size
-    integer, intent(in), optional :: stride
-    integer :: stride_
-    type(layer) :: res
-
-    if (pool_size < 2) &
-      error stop 'pool_size must be >= 2 in a avgpool3d layer'
-
-    ! Stride defaults to pool_size if not provided
-    if (present(stride)) then
-      stride_ = stride
-    else
-      stride_ = pool_size
-    end if
-
-    if (stride_ < 1) &
-      error stop 'stride must be >= 1 in a avgpool3d layer'
-
-    res % name = 'avgpool3d'
-
-    allocate( &
-      res % p, &
-      source=avgpool3d_layer(pool_size, stride_) &
-    )
-
-  end function avgpool3d
-
-
   module function input1d(layer_size) result(res)
     integer, intent(in) :: layer_size
     type(layer) :: res
@@ -318,36 +286,6 @@ module function maxpool2d(pool_size, stride) result(res)
 
   end function maxpool2d
 
-
-  module function maxpool3d(pool_size, stride) result(res)
-    integer, intent(in) :: pool_size
-    integer, intent(in), optional :: stride
-    integer :: stride_
-    type(layer) :: res
-
-    if (pool_size < 2) &
-      error stop 'pool_size must be >= 2 in a maxpool3d layer'
-
-    ! Stride defaults to pool_size if not provided
-    if (present(stride)) then
-      stride_ = stride
-    else
-      stride_ = pool_size
-    end if
-
-    if (stride_ < 1) &
-      error stop 'stride must be >= 1 in a maxpool3d layer'
-
-    res % name = 'maxpool3d'
-
-    allocate( &
-      res % p, &
-      source=maxpool3d_layer(pool_size, stride_) &
-    )
-
-  end function maxpool3d
-
-
   module function reshape2d(dim1, dim2) result(res)
     integer, intent(in) :: dim1, dim2
     type(layer) :: res