make loading of MNIST validation set optional

Author: milancurcic

README.md

@@ -238,7 +238,6 @@ program example_mnist
 
   real(rk), allocatable :: tr_images(:,:), tr_labels(:)
   real(rk), allocatable :: te_images(:,:), te_labels(:)
-  real(rk), allocatable :: va_images(:,:), va_labels(:)
   real(rk), allocatable :: input(:,:), output(:,:)
 
   type(network_type) :: net
@@ -247,8 +246,7 @@ program example_mnist
   integer(ik) :: batch_size, batch_start, batch_end
   real(rk) :: pos
 
-  call load_mnist(tr_images, tr_labels, te_images,&
-                  te_labels, va_images, va_labels)
+  call load_mnist(tr_images, tr_labels, te_images, te_labels)
 
   net = network_type([784, 30, 10])
 

src/lib/mod_mnist.f90

@@ -43,7 +43,7 @@ subroutine load_mnist(tr_images, tr_labels, te_images,&
     ! Loads the MNIST dataset into arrays.
     real(rk), allocatable, intent(in out) :: tr_images(:,:), tr_labels(:)
     real(rk), allocatable, intent(in out) :: te_images(:,:), te_labels(:)
-    real(rk), allocatable, intent(in out) :: va_images(:,:), va_labels(:)
+    real(rk), allocatable, intent(in out), optional :: va_images(:,:), va_labels(:)
     integer(ik), parameter :: dtype = 4, image_size = 784
     integer(ik), parameter :: tr_nimages = 50000
     integer(ik), parameter :: te_nimages = 10000
@@ -59,10 +59,12 @@ subroutine load_mnist(tr_images, tr_labels, te_images,&
     call read_binary_file('../data/mnist/mnist_testing_labels.dat',&
                           dtype, te_nimages, te_labels)
 
-    call read_binary_file('../data/mnist/mnist_validation_images.dat',&
-                          dtype, image_size, va_nimages, va_images)
-    call read_binary_file('../data/mnist/mnist_validation_labels.dat',&
-                          dtype, va_nimages, va_labels)
+    if (present(va_images) .and. present(va_labels)) then
+      call read_binary_file('../data/mnist/mnist_validation_images.dat',&
+                            dtype, image_size, va_nimages, va_images)
+      call read_binary_file('../data/mnist/mnist_validation_labels.dat',&
+                            dtype, va_nimages, va_labels)
+    end if
 
   end subroutine load_mnist
 

src/tests/example_mnist.f90

@@ -12,7 +12,7 @@ program example_mnist
 
   real(rk), allocatable :: tr_images(:,:), tr_labels(:)
   real(rk), allocatable :: te_images(:,:), te_labels(:)
-  real(rk), allocatable :: va_images(:,:), va_labels(:)
+  !real(rk), allocatable :: va_images(:,:), va_labels(:)
   real(rk), allocatable :: input(:,:), output(:,:)
 
   type(network_type) :: net
@@ -21,8 +21,7 @@ program example_mnist
   integer(ik) :: batch_size, batch_start, batch_end
   real(rk) :: pos
 
-  call load_mnist(tr_images, tr_labels, te_images,&
-                  te_labels, va_images, va_labels)
+  call load_mnist(tr_images, tr_labels, te_images, te_labels)
 
   net = network_type([784, 10, 10])