Test uninitialized dropout layer

Author: milancurcic

src/nf/nf_dropout_layer.f90

@@ -12,10 +12,9 @@ module nf_dropout_layer
   public :: dropout_layer
 
   type, extends(base_layer) :: dropout_layer
-
     !! Concrete implementation of a dropout layer type
 
-    integer :: input_size
+    integer :: input_size = 0
 
     real, allocatable :: output(:)
     real, allocatable :: gradient(:)

src/nf/nf_layer_submodule.f90

@@ -3,6 +3,7 @@
   use iso_fortran_env, only: stderr => error_unit
   use nf_conv2d_layer, only: conv2d_layer
   use nf_dense_layer, only: dense_layer
+  use nf_dropout_layer, only: dropout_layer
   use nf_flatten_layer, only: flatten_layer
   use nf_input1d_layer, only: input1d_layer
   use nf_input3d_layer, only: input3d_layer
@@ -240,15 +241,17 @@ impure elemental module subroutine init(self, input)
       call this_layer % init(input % layer_shape)
     end select
 
-    ! The shape of conv2d, maxpool2d, or flatten layers is not known
+    ! The shape of conv2d, dropout, flatten, or maxpool2d layers is not known
     ! until we receive an input layer.
     select type(this_layer => self % p)
       type is(conv2d_layer)
         self % layer_shape = shape(this_layer % output)
-      type is(maxpool2d_layer)
+      type is(dropout_layer)
         self % layer_shape = shape(this_layer % output)
       type is(flatten_layer)
         self % layer_shape = shape(this_layer % output)
+      type is(maxpool2d_layer)
+        self % layer_shape = shape(this_layer % output)
     end select
 
     self % input_layer_shape = input % layer_shape 

test/test_dropout_layer.f90

@@ -1,6 +1,7 @@
 program test_dropout_layer
   use iso_fortran_env, only: stderr => error_unit
   use nf, only: dropout, layer
+  use nf_dropout_layer, only: dropout_layer
   type(layer) :: layer1
   logical :: ok = .true.
 
@@ -11,6 +12,23 @@ program test_dropout_layer
     write(stderr, '(a)') 'dropout layer has its name set correctly.. failed'
   end if
 
+  ! Dropout on its own is not initialized and its arrays not allocated.
+  select type(layer1_p => layer1 % p)
+    type is(dropout_layer)
+
+      if (layer1_p % input_size /= 0) then
+        print *, 'input_size: ', layer1_p % input_size
+        ok = .false.
+        write(stderr, '(a)') 'dropout layer size should be zero.. failed'
+      end if
+
+      if (allocated(layer1_p % output)) then
+        ok = .false.
+        write(stderr, '(a)') 'dropout layer output array should not be allocated.. failed'
+      end if
+
+  end select
+
   if (ok) then
     print '(a)', 'test_dropout_layer: All tests passed.'
   else