network % output is now generic for input ranks 1 and 3

Author: milancurcic

src/nf/nf_network.f90

@@ -17,15 +17,17 @@ module nf_network
   contains
 
     procedure :: backward
-    procedure :: output
     procedure :: print_info
     procedure :: train
     procedure :: update
 
     procedure, private :: forward_1d
     procedure, private :: forward_3d
+    procedure, private :: output_1d
+    procedure, private :: output_3d
 
     generic :: forward => forward_1d, forward_3d
+    generic :: output => output_1d, output_3d
 
   end type network
 
@@ -72,6 +74,30 @@ end subroutine forward_3d
 
   end interface forward
 
+  interface output
+
+    module function output_1d(self, input) result(res)
+      !! Return the output of the network given the input 1-d array.
+      class(network), intent(in out) :: self
+        !! Network instance
+      real, intent(in) :: input(:)
+        !! Input data
+      real, allocatable :: res(:)
+        !! Output of the network
+    end function output_1d
+
+    module function output_3d(self, input) result(res)
+      !! Return the output of the network given the input 3-d array.
+      class(network), intent(in out) :: self
+        !! Network instance
+      real, intent(in) :: input(:,:,:)
+        !! Input data
+      real, allocatable :: res(:)
+        !! Output of the network
+    end function output_3d
+
+  end interface output
+
   interface
 
     pure module subroutine backward(self, output)
@@ -85,16 +111,6 @@ pure module subroutine backward(self, output)
         !! Output data
     end subroutine backward
 
-    module function output(self, input) result(res)
-      !! Return the output of the network given the input array.
-      class(network), intent(in out) :: self
-        !! Network instance
-      real, intent(in) :: input(:)
-        !! Input data
-      real, allocatable :: res(:)
-        !! Output of the network
-    end function output
-
     module subroutine print_info(self)
       !! Prints a brief summary of the network and its layers to the screen.
       class(network), intent(in) :: self

src/nf/nf_network_submodule.f90

@@ -1,6 +1,7 @@
 submodule(nf_network) nf_network_submodule
 
   use nf_dense_layer, only: dense_layer
+  use nf_flatten_layer, only: flatten_layer
   use nf_input1d_layer, only: input1d_layer
   use nf_input3d_layer, only: input3d_layer
   use nf_layer, only: layer
@@ -114,7 +115,7 @@ pure module subroutine forward_3d(self, input)
   end subroutine forward_3d
 
 
-  module function output(self, input) result(res)
+  module function output_1d(self, input) result(res)
     class(network), intent(in out) :: self
     real, intent(in) :: input(:)
     real, allocatable :: res(:)
@@ -124,11 +125,34 @@ module function output(self, input) result(res)
 
     call self % forward(input)
 
-    select type(output_layer => self % layers(num_layers) % p); type is(dense_layer)
-      res = output_layer % output
+    select type(output_layer => self % layers(num_layers) % p)
+      type is(dense_layer)
+        res = output_layer % output
+      type is(flatten_layer)
+        res = output_layer % output
     end select
 
-  end function output
+  end function output_1d
+
+
+  module function output_3d(self, input) result(res)
+    class(network), intent(in out) :: self
+    real, intent(in) :: input(:,:,:)
+    real, allocatable :: res(:)
+    integer :: num_layers
+
+    num_layers = size(self % layers)
+
+    call self % forward(input)
+
+    select type(output_layer => self % layers(num_layers) % p)
+      type is(dense_layer)
+        res = output_layer % output
+      type is(flatten_layer)
+        res = output_layer % output
+    end select
+
+  end function output_3d
 
 
   module subroutine print_info(self)