Merge branch 'main' into download-mnist.tar.gz

Author: milancurcic

CMakeLists.txt

@@ -35,7 +35,6 @@ if(SERIAL)
   message(STATUS "Configuring build for serial execution")
 else()
   message(STATUS "Configuring build for parallel execution")
-  add_definitions(-DCAF)
 endif()
 
 # compiler flags for gfortran
@@ -60,6 +59,11 @@ endif()
 # compiler flags for ifort
 if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
 
+  if(SERIAL)
+    message(STATUS "Configuring to build with -coarray=single")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -coarray=single")
+  endif()
+
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp -assume byterecl,realloc_lhs -heap-arrays")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -C -traceback")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3")

README.md

@@ -43,6 +43,12 @@ Dependencies:
 * OpenCoarrays (optional, for parallel execution, GFortran only)
 * BLAS, MKL (optional)
 
+Compilers tested include:
+
+* gfortran-10.3.0
+* ifort-2021.4
+* ifx-2021.4
+
 ### Building with fpm
 
 #### Building in serial mode
@@ -59,7 +65,7 @@ Once installed, use the compiler wrappers `caf` and `cafrun` to build and execut
 in parallel, respectively:
 
 ```
-fpm build --compiler caf --flag "-cpp -DCAF -O3 -ffast-math"
+fpm build --compiler caf --flag "-cpp -O3 -ffast-math"
 ```
 
 #### Testing with fpm

fpm.toml

@@ -1,6 +1,6 @@
 name = "neural-fortran"
-version = "0.1.0"
+version = "0.2.0"
 license = "MIT"
 author = "Milan Curcic"
 maintainer = "milancurcic@hey.com"
-copyright = "Copyright 2018-2021, neural-fortran contributors"
+copyright = "Copyright 2018-2022, neural-fortran contributors"

src/mod_layer_submodule.f90

@@ -59,19 +59,15 @@ module subroutine db_co_sum(db)
     type(array1d), allocatable, intent(in out) :: db(:)
     integer(ik) :: n
     do n = 2, size(db)
-#ifdef CAF
       call co_sum(db(n) % array)
-#endif
     end do
   end subroutine db_co_sum
 
   module subroutine dw_co_sum(dw)
     type(array2d), allocatable, intent(in out) :: dw(:)
     integer(ik) :: n
     do n = 1, size(dw) - 1
-#ifdef CAF
       call co_sum(dw(n) % array)
-#endif
     end do
   end subroutine dw_co_sum
 

src/mod_network_submodule.f90

@@ -190,10 +190,8 @@ module subroutine sync(self, image)
     integer(ik) :: n
     if (num_images() == 1) return
     layers: do n = 1, size(self % dims)
-#ifdef CAF
       call co_broadcast(self % layers(n) % b, image)
       call co_broadcast(self % layers(n) % w, image)
-#endif
     end do layers
   end subroutine sync