template

Author: scivision

.appveyor.yml

@@ -1,36 +1,31 @@
 image:
 - Visual Studio 2017
+# - Ubuntu   too old CMake 3.5
 
 stack: python 3
 
 environment:
   MINGW_DIR: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
-  PY_DIR: C:\Python36-x64
+  PY_DIR: C:\Python37-x64
 
 clone_depth: 3
 
 before_build:
 - cmd: set PATH=%MINGW_DIR%;%PY_DIR%;%PY_DIR%\Scripts;%PATH%
-# fix CMake sh.exe issue, by removing Git path.
-- cmd: set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
-- cmd: set FC=%MINGW_DIR%\gfortran 
-- cmd: set CXX=%MINGW_DIR%\g++ 
-- cmd: set CC=%MINGW_DIR%\gcc
-- cmd: mklink bin\make.exe %MINGW_DIR%\mingw32-make.exe
 
-- sh: sudo apt -yq update > /dev/null
-- sh: sudo apt install -yq --no-install-suggests --no-install-recommends gfortran cmake make > /dev/null
+- sh: sudo apt-get -yq update > /dev/null
+- sh: sudo apt-get install -yq --no-install-suggests --no-install-recommends gfortran cmake make > /dev/null
 
 build_script:
 - pip install -e .[tests]
 
 - cd bin
-- cmd: cmake -G "MinGW Makefiles" ..
+- cmd: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
 - sh: cmake ..
-- make
+- cmake --build .
 
 after_build:
-- make test
+- ctest -V
 - cd ..
-- pytest -v
+- pytest -xsv
 

.travis.yml

@@ -1,21 +1,22 @@
 language: python
-fast_finish: true
+sudo: required
+dist: xenial
+group: travis_latest
+
+git:
+  depth: 3
+  quiet: true
 
-python: 
+python:
   - 3.5
   - 3.6
-  - "3.7-dev"
+  - 3.7
 
 os:
   - linux
 
 env: FC=gfortran-6
 
-group: travis_latest
-  
-git:
-  depth: 3
-
 addons:
   apt:
     sources:
@@ -27,32 +28,29 @@ addons:
 before_install:
   - if [[ $TRAVIS_OS_NAME == osx ]]; then
       brew update > /dev/null;
-      brew install gcc || true > /dev/null;
-      brew link --overwrite gcc > /dev/null;
+      brew install gcc > /dev/null || brew link --overwrite gcc > /dev/null;
       export FC=gfortran;
       brew install opencoarrays > /dev/null;
     fi
 
 install:
-  - pip -q install -e .[tests]
-  
+  - pip install -e .[tests]
+
   - cd bin
   - cmake ..
-  - make
-  - make test
-  - cd ..
+  - cmake --build .
 
-script: 
+script:
+  - ctest -V
+  - cd ..
+  
   - pytest -sv
   - flake8
   - mypy . --ignore-missing-imports
 
-after_success: 
+after_success:
   - if [[ $TRAVIS_PYTHON_VERSION == 3.6* ]]; then
-    coverage run tests/test_all.py;
+    pytest --cov;
     coveralls;
     fi
-    
-after_failure:
-  - ctest -V
 

CMakeLists.txt

@@ -10,12 +10,12 @@ else()
 endif()
 
 if(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
-  if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 8.1)
+  if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 8)
     list(APPEND FFLAGS -std=f2018)
   endif()
 
   list(APPEND FFLAGS -mtune=native -Wall -Wextra -Wpedantic -Werror=array-bounds -fbacktrace -fexceptions)
-  if(NOT CYGWIN AND NOT WIN32)
+  if(UNIX AND NOT (CYGWIN OR APPLE))
     list(APPEND FFLAGS -fstack-protector-all)
   endif()
 elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL PGI)
@@ -43,13 +43,17 @@ elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
   endif()
 endif()
 
-set(okcomp GNU Intel)
-if(CMAKE_Fortran_COMPILER_ID IN_LIST okcomp)
-  add_library(assert assert.f90)
+
+add_library(assert assert.f90)
+target_compile_options(assert PRIVATE ${FFLAGS})
+
+set(f08 GNU Intel)
+if(CMAKE_Fortran_COMPILER_ID IN_LIST f08)
+  target_sources(assert PRIVATE error2008.f90)
 else()
-  add_library(assert assert_legacy.f90)
+  target_sources(assert PRIVATE error2003.f90)
 endif()
-target_compile_options(assert PRIVATE ${FFLAGS})
+
 
 add_library(lineclip lineclipping.f90)
 target_compile_options(lineclip PRIVATE ${FFLAGS})

DemoLineclip.f90

@@ -2,7 +2,7 @@ program test
 
     use, intrinsic:: ieee_arithmetic
     use lineclip,only: Ccohensutherland, cohensutherland
-    use assert, only: wp, err, assert_isclose
+    use assert, only: wp, errorstop, assert_isclose
 
     implicit none
 
@@ -66,7 +66,7 @@ subroutine test_lineclip()
     x1=0.;y1=0.1;x2=0.;y2=0.1
 
     call cohensutherland(xmin,ymax,xmax,ymin,x1,y1,x2,y2)
-    if (.not.all(ieee_is_nan([x1,y1,x2,y2]))) call err('failed no intersection test')
+    if (.not.all(ieee_is_nan([x1,y1,x2,y2]))) call errorstop() !'failed no intersection test'
 
     print *, 'OK lineclip'
 

DemoLineclip.py

@@ -1,22 +1,29 @@
 #!/usr/bin/env python
 import numpy as np
-from lineClipping import cohensutherland
+from pylineclip import cohensutherland
 
 """
 make box with corners LL/UR (1,3) (4,5)
 and line segment with ends (0,0) (4,6)
 """
-# %% LOWER to UPPER test
-x1, y1, x2, y2 = cohensutherland(1,  5, 4, 3,
-                                 0,  0, 4, 6)
 
-np.testing.assert_array_almost_equal([x1, y1, x2, y2], [2, 3, 3.3333333333333, 5])
-# %% no intersection test
-x1, y1, x2, y2 = cohensutherland(1, 5,  4, 3,
-                                 0, 0.1, 0, 0.1)
 
-assert x1 is None and y1 is None and x2 is None and y2 is None
-# %% left to right test
-x1, y1, x2, y2 = cohensutherland(1, 5, 4, 3,
-                                 0, 4, 5, 4)
-np.testing.assert_array_almost_equal([x1, y1, x2, y2], [1, 4, 4, 4])
+def main():
+    # %% LOWER to UPPER test
+    x1, y1, x2, y2 = cohensutherland(1,  5, 4, 3,
+                                     0,  0, 4, 6)
+
+    np.testing.assert_array_almost_equal([x1, y1, x2, y2], [2, 3, 3.3333333333333, 5])
+    # %% no intersection test
+    x1, y1, x2, y2 = cohensutherland(1, 5,  4, 3,
+                                     0, 0.1, 0, 0.1)
+
+    assert x1 is None and y1 is None and x2 is None and y2 is None
+    # %% left to right test
+    x1, y1, x2, y2 = cohensutherland(1, 5, 4, 3,
+                                     0, 4, 5, 4)
+    np.testing.assert_array_almost_equal([x1, y1, x2, y2], [1, 4, 4, 4])
+
+
+if __name__ == '__main__':
+    main()

assert.f90

@@ -1,15 +1,17 @@
 module assert
+! Gfortran >= 6 needed for ieee_arithmetic: ieee_is_nan
 
   use, intrinsic:: iso_c_binding, only: sp=>c_float, dp=>c_double
   use, intrinsic:: iso_fortran_env, only: stderr=>error_unit
-  use, intrinsic:: ieee_arithmetic
+  use, intrinsic:: ieee_arithmetic, only: ieee_is_finite, ieee_is_nan
+  use error, only: errorstop
   implicit none
   private
-  
+
   integer,parameter :: wp = sp
 
-  public :: wp,isclose, assert_isclose, err
-  
+  public :: wp,isclose, assert_isclose, errorstop
+
 contains
 
 elemental logical function isclose(actual, desired, rtol, atol, equal_nan)
@@ -29,7 +31,7 @@ elemental logical function isclose(actual, desired, rtol, atol, equal_nan)
   real(wp), intent(in) :: actual, desired
   real(wp), intent(in), optional :: rtol, atol
   logical, intent(in), optional :: equal_nan
-  
+
   real(wp) :: r,a
   logical :: n
   ! this is appropriate INSTEAD OF merge(), since non present values aren't defined.
@@ -41,12 +43,12 @@ elemental logical function isclose(actual, desired, rtol, atol, equal_nan)
   if (present(equal_nan)) n = equal_nan
 
   !print*,r,a,n,actual,desired
-  
+
 !--- sanity check
-  if ((r < 0._wp).or.(a < 0._wp)) error stop 'tolerances must be non-negative'
-!--- simplest case
-  isclose = (actual == desired) 
-  if (isclose) return
+  if ((r < 0._wp).or.(a < 0._wp)) call errorstop
+!--- simplest case -- too unlikely, especially for arrays?
+  !isclose = (actual == desired)
+  !if (isclose) return
 !--- equal nan
   isclose = n.and.(ieee_is_nan(actual).and.ieee_is_nan(desired))
   if (isclose) return
@@ -59,6 +61,8 @@ end function isclose
 
 
 impure elemental subroutine assert_isclose(actual, desired, rtol, atol, equal_nan, err_msg)
+! NOTE: with Fortran 2018 this can be Pure
+! 
 ! inputs
 ! ------
 ! actual: value "measured"
@@ -77,15 +81,10 @@ impure elemental subroutine assert_isclose(actual, desired, rtol, atol, equal_na
 
   if (.not.isclose(actual,desired,rtol,atol,equal_nan)) then
     write(stderr,*) merge(err_msg,'',present(err_msg)),': actual',actual,'desired',desired
-    error stop
+    call errorstop
   endif
 
 end subroutine assert_isclose
 
-
-pure subroutine err(msg)
-  character, intent(in) :: msg
-  error stop msg
-end subroutine err
-
 end module assert
+

assert_legacy.f90

@@ -0,0 +1,12 @@
+module error
+
+implicit none
+
+contains
+
+pure subroutine errorstop
+  stop 1
+end subroutine errorstop
+
+end module error
+