fortran, ci template

Author: scivision

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 132
+exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/

CMakeLists.txt

@@ -1,81 +1,51 @@
 cmake_minimum_required (VERSION 3.7)
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug or Release")
+endif()
 project(spectrum C CXX Fortran)
 enable_testing()
 
-option(USE_MKL "use Intel MKL")
 # we build separate libraries for real and complex to avoid polymorphic performance hits and complexities.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/)
 
-include(cmake/math.cmake)
 # *** DO NOT use -ffast-math *** it screws up the signaling between modules!!
 include(cmake/compilers.cmake)
 
 add_compile_options(${FLAGS})
 
-add_library(subspace SHARED filters.f90 covariance.f90 subspace.f90 signals.f90 perf.f90)
-if(f2008)
+find_package(LAPACK REQUIRED)
+
+add_library(subspace filters.f90 covariance.f90 subspace.f90 signals.f90 perf.f90)
+if(f2018)
   target_sources(subspace PRIVATE comm.f90)
 else()
   target_sources(subspace PRIVATE comm_legacy.f90)
 endif()
-target_link_libraries(subspace PRIVATE ${FLIBS})
 target_compile_options(subspace PRIVATE ${FFLAGS})
+target_link_libraries(subspace PRIVATE ${LAPACK_LIBRARIES})
 
 #------ test program: Fortran Complex Double Precision ----------
 add_executable(fespritcmpl RunSubspace.f90)
-target_link_libraries(fespritcmpl subspace ${FLIBS})
+target_link_libraries(fespritcmpl subspace)
 target_compile_options(fespritcmpl PRIVATE ${FFLAGS})
 add_test(NAME FortranComplexEsprit COMMAND fespritcmpl)
+set_tests_properties(FortranComplexEsprit PROPERTIES TIMEOUT 15)
 #------ test program: Fortran Real Single Precision -------------
 add_executable(fespritreal RunSubspace_realsp.f90)
-target_link_libraries(fespritreal subspace ${FLIBS})
+target_link_libraries(fespritreal subspace)
 target_compile_options(fespritreal PRIVATE ${FFLAGS})
 add_test(NAME FortranRealEsprit COMMAND fespritreal)
+set_tests_properties(FortranRealEsprit PROPERTIES TIMEOUT 15)
 #------ test program: C++ Real Single ---------------------------
 add_executable(cppesprit cppSubspace.cpp)
-target_link_libraries(cppesprit subspace ${CLIBS} ${CXXLIBS})
+target_link_libraries(cppesprit subspace)
 set_target_properties(cppesprit PROPERTIES CXX_STANDARD 11)
 add_test(NAME C++Esprit COMMAND cppesprit)
+set_tests_properties(C++Esprit PROPERTIES TIMEOUT 15)
 #------ test program: C Real Single -----------------------------
 add_executable(cesprit cSubspace.c)
-target_link_libraries(cesprit subspace ${CLIBS})
+target_link_libraries(cesprit subspace)
 set_target_properties(cesprit PROPERTIES C_STANDARD 11)
 add_test(NAME C-Esprit COMMAND cesprit)
-
-
-#-------------------------------------------------------------------------------
-
-# ------ mkl manual working --  NOTE: -Wl,--no-as-need prevents runtime errors
-# gfortran -fdefault-integer-8 -g -I$MKLROOT/include/intel64/ilp64 -m64  -I$MKLROOT/include ../comm.f90 ../perf.f90 ../covariance.f90 ../subspace.f90 ../signals.f90 ../RunSubspace.f90 -L$MKLROOT/lib/intel64 -lmkl_blas95_ilp64 -lmkl_lapack95_ilp64 -lmkl_gf_ilp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl && ./a.out
-
-# OpenBLAS gfortran Complex64 WORKING
-# gfortran ../comm.f90 ../perf.f90 ../covariance.f90 ../subspace.f90 ../signals.f90 ../RunSubspace.f90 -lblas -llapack -lpthread -lm  && ./a.out
-#
-# MKL gfortran Real32 WORKING
-# gfortran ../comm.f90 ../perf.f90 ../covariance_realsp.f90 ../subspace_realsp.f90 ../signals_realsp.f90 ../filters.f90  ../RunSubspace_realsp.f90 -lmkl_blas95_lp64 -lmkl_lapack95_lp64 -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -ldl -lm  && ./a.out
-#
-# not working 8-byte integer Parameter 13 SGESVD
-# ifort -i8 -I${F95ROOT}/include/intel64/ilp64 -I${MKLROOT}/include  ../comm.f90 ../perf.f90 ../covariance_realsp.f90 ../subspace_realsp.f90 ../signals_realsp.f90 ../filters.f90  ../RunSubspace_realsp.f90 ${MKLROOT}/lib/intel64/libmkl_blas95_ilp64.a ${MKLROOT}/lib/intel64/libmkl_lapack95_ilp64.a -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_gf_ilp64 -lmkl_sequential -lmkl_core -lpthread -ldl -lm  && ./a.out
-#
-#
-# ifort -I${F95ROOT}/include/intel64/lp64 -I${MKLROOT}/include  ../comm.f90 ../perf.f90 ../covariance_realsp.f90 ../subspace_realsp.f90 ../signals_realsp.f90 ../filters.f90  ../RunSubspace_realsp.f90 ${MKLROOT}/lib/intel64/libmkl_blas95_lp64.a ${MKLROOT}/lib/intel64/libmkl_lapack95_lp64.a -L${MKLROOT}/lib/intel64 -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -ldl -lm  && ./a.out
-
-
-#---- intel compiler
-# note that you can compile first with GCC then link with ICPC (kind of silly 
-# since main computation is done in Fortran, but just to show the concept)
-# cmake ..
-# make
-# icpc ../cppSubspace.cpp libsubspace_real.a -lgfortran -llapack
-
-# using Intel Compiler requires linking:
-# svml intlc ifcore imf
-# that do not work for GCC
-# 
-# cd bin
-# rm -r *
-# FC=ifort CC=icc CXX=icpc cmake ..
-# make
-# icpc ../cppSubspace.cpp libsubspace_real.a -lifcore -lsvml -lintlc -limf
-
+set_tests_properties(C-Esprit PROPERTIES TIMEOUT 15)
 

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -1,7 +1,7 @@
-program test_subspace
+
 use,intrinsic:: iso_fortran_env, only: int64, stderr=>error_unit
 use,intrinsic:: iso_c_binding, only: c_int
-use comm, only: dp, random_init, err
+use comm, only: dp, rand_init
 use perf, only: sysclock2ms
 use subspace, only: esprit
 use signals,only: signoise
@@ -22,7 +22,7 @@ program test_subspace
 integer :: narg
 character(16) :: arg
 
-call random_init()
+call rand_init(.false., .false.)
 !----------- parse command line ------------------
 M = Ns / 4_c_int
 narg = command_argument_count()
@@ -49,14 +49,14 @@ program test_subspace
 !--- checking system numerics --------------
 if (storage_size(fs) /= 64) then
   write(stderr,*) 'expected 64-bit real but you have: ', storage_size(fs)
-  call err('')
+  error stop
 endif
 if (storage_size(x(1)) /= 128) then
   write(stderr,*) 'expected 128-bit complex but you have: ', storage_size(x(1))
-  call err('')
+  error stop
 endif
 
-!------ simulate noisy signal ------------ 
+!------ simulate noisy signal ------------
 call signoise(fs,f0,snr,Ns,&
               x)
 !------ estimate frequency of sinusoid in noise --------
@@ -66,7 +66,7 @@ program test_subspace
 call system_clock(toc)
 
 ! -- assert <0.1% error ---------
-if (abs(tones(1)-f0) > 0.001*f0) call err('excessive estimation error')
+if (abs(tones(1)-f0) > 0.001*f0)  error stop 'excessive estimation error'
 
 print '(A,100F10.2)', 'estimated tone freq [Hz]: ',tones
 print '(A,100F5.1)', 'with sigma: ',sigma
@@ -75,5 +75,5 @@ program test_subspace
 print *,'OK'
 
 ! deallocate(x,tones,sigma) ! this is automatic going out of scope
-end program test_subspace
+end program
 

RunSubspace.f90

@@ -1,7 +1,7 @@
-program test_subspace
+
 use,intrinsic:: iso_fortran_env, only: int64, stderr=>error_unit
 use,intrinsic:: iso_c_binding, only: c_int,c_bool
-use comm, only: sp, random_init, err
+use comm, only: sp, rand_init
 use perf, only: sysclock2ms
 use subspace, only: esprit
 use signals, only: signoise
@@ -19,7 +19,7 @@ program test_subspace
 integer(c_int) :: M,Nb
 integer:: fstat
 logical(c_bool) :: filtok
- 
+
 
 real(sp),allocatable :: x(:), b(:), y(:)
 real(sp),allocatable :: tones(:),sigma(:)
@@ -28,7 +28,7 @@ program test_subspace
 integer :: narg,u
 character(16) :: arg
 
-call random_init()
+call rand_init(.false., .false.)
 !----------- parse command line ------------------
 M = Ns / 2_c_int
 narg = command_argument_count()
@@ -55,9 +55,9 @@ program test_subspace
 !--- checking system numerics --------------
 if (storage_size(fs) /= 32) then
   write(stderr,*) 'expected 32-bit real but you have : ', storage_size(fs)
-  call err('')
+  error stop
 endif
-!------ simulate noisy signal ------------ 
+!------ simulate noisy signal ------------
 call signoise(fs, f0, snr, Ns, x)   ! output "X"
 !------ filter noisy signal --------------
 ! read coefficients 'b'
@@ -89,7 +89,7 @@ program test_subspace
 call system_clock(toc)
 
 ! -- assert <0.1% error ---------
-if (abs(tones(1)-f0) > 0.001*f0) call err('excessive frequency estimation error')
+if (abs(tones(1)-f0) > 0.001*f0) error stop 'excessive frequency estimation error'
 
 print '(A,100F10.2)', 'estimated tone freq [Hz]: ',tones
 print '(A,100F5.1)', 'with sigma: ',sigma
@@ -98,5 +98,5 @@ program test_subspace
 print *,'OK'
 
 ! deallocate(x,y,tones,sigma)  ! this is automatic going out of scope
-end program test_subspace
+end program
 

RunSubspace_realsp.f90

@@ -1,15 +1,14 @@
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  add_compile_options(-g -O0)
-else()
-  add_compile_options(-O3)
-endif()
-
-
 if(${CMAKE_Fortran_COMPILER_ID} STREQUAL Intel)
     list(APPEND CLIBS ifcoremt imf svml intlc)
     if(CMAKE_BUILD_TYPE STREQUAL Debug)
       list(APPEND FFLAGS -check all -fpe0 -warn -traceback -debug extended)
     endif()
+
+    if(WIN32)
+      list(APPEND FFLAGS /heap-arrays)
+    else()
+      list(APPEND FFLAGS -heap-arrays)
+    endif()
 elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
   if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 8)
     list(APPEND FFLAGS -std=f2018)
@@ -21,12 +20,10 @@ elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
 elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL PGI)
 
 elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL Flang)
-#  list(APPEND CXXLIBS)  # Not needed:  stdc++ c++abi   Don't use: -stdlib=libc++
-  list(APPEND FFLAGS -Mallocatable=03)
-  list(APPEND FLIBS -static-flang-libs)
+
 endif()
 
 
 include(CheckFortranSourceCompiles)
-check_fortran_source_compiles("program es; error stop; end" f2008
+check_fortran_source_compiles("call random_init(.false., .false.); end" f2018
                               SRC_EXT f90)

cmake/compilers.cmake

@@ -1,29 +1,19 @@
 module comm
-  use, intrinsic :: iso_c_binding, only: sp=>C_FLOAT, dp=>C_DOUBLE, int64=>C_LONG_LONG, sizeof=>c_sizeof
-  use, intrinsic :: iso_fortran_env, only: stderr=>error_unit
-  implicit none
-  
-  complex(dp),parameter :: J=(0._dp, 1._dp)
-  real(dp),parameter :: pi = 4._dp*atan(1._dp)
-  logical :: debug = .false.
+use, intrinsic :: iso_c_binding, only: sp=>C_FLOAT, dp=>C_DOUBLE, int64=>C_LONG_LONG, sizeof=>c_sizeof
+implicit none
+public
+
+complex(dp),parameter :: J=(0._dp, 1._dp)
+real(dp),parameter :: pi = 4._dp*atan(1._dp)
+logical :: debug = .false.
 
 contains
 
-subroutine random_init()
-  integer :: i, n, clock
-  integer, allocatable :: seed(:)
+subroutine rand_init(repeatable, image_distinct)
+logical, intent(in) :: repeatable, image_distinct
 
-  call random_seed(size=n)
-  allocate(seed(n))
-  call system_clock(count=clock)
-  seed = clock + 37 * [ (i - 1, i = 1, n) ]
-  call random_seed(put=seed)
-end subroutine
+call random_init(repeatable, image_distinct)
+end subroutine rand_init
 
-subroutine err(msg)
-  character(*), intent(in) :: msg
-  write(stderr,*) msg
-  error stop 
-end subroutine err
 
 end module comm

cmake/math.cmake

@@ -1,28 +1,24 @@
 module comm
-    use, intrinsic :: iso_c_binding, only: sp=>C_FLOAT, dp=>C_DOUBLE, int64=>C_LONG_LONG, sizeof=>c_sizeof
-    use, intrinsic :: iso_fortran_env, only: stderr=>error_unit
-    implicit none
-    
-    complex(dp),parameter :: J=(0._dp, 1._dp)
-    real(dp),parameter :: pi = 4._dp*atan(1._dp)
+use, intrinsic :: iso_c_binding, only: sp=>C_FLOAT, dp=>C_DOUBLE, int64=>C_LONG_LONG, sizeof=>c_sizeof
+implicit none
+
+complex(dp),parameter :: J=(0._dp, 1._dp)
+real(dp),parameter :: pi = 4._dp*atan(1._dp)
+logical :: debug = .false.
 
 contains
 
-subroutine random_init()
-    integer :: i, n, clock
-    integer, allocatable :: seed(:)
+subroutine rand_init(repeatable, image_distinct)
+logical, intent(in), optional :: repeatable, image_distinct
+integer :: i, n, clock
+integer, allocatable :: seed(:)
 
-    call random_seed(size=n)
-    allocate(seed(n))
-    call system_clock(count=clock)
-    seed = clock + 37 * [ (i - 1, i = 1, n) ]
-    call random_seed(put=seed)
-end subroutine
+call random_seed(size=n)
+allocate(seed(n))
+call system_clock(count=clock)
+seed = clock + 37 * [ (i - 1, i = 1, n) ]
+call random_seed(put=seed)
+end subroutine rand_init
 
-subroutine err(msg)
-  character(*), intent(in) :: msg
-  write(stderr,*) msg
-  stop -1
-end subroutine err
 
 end module comm

comm.f90

@@ -1,16 +1,16 @@
 module covariance
-  use, intrinsic:: iso_c_binding, only: c_int
-  use comm,only: sp, dp
-  !use perf, only : sysclock2ms
-  Implicit none
-  
-  interface autocov
-    procedure autocov_r, autocov_c
-  end interface autocov
-  
-  private
-  
-  public :: autocov, autocov_r, autocov_c  ! latter two for f2py
+use, intrinsic:: iso_c_binding, only: c_int
+use comm,only: sp, dp
+!use perf, only : sysclock2ms
+Implicit none
+
+interface autocov
+  procedure autocov_r, autocov_c
+end interface autocov
+
+private
+
+public :: autocov, autocov_r, autocov_c  ! latter two for f2py
 
 contains