Merge pull request #33 from jacobwilliams/32-ci-gfortran-versions

32 ci gfortran versions

Author: jacobwilliams

.github/workflows/CI.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        gcc_v: [10] # Version of GFortran we want to use.
+        gcc_v: [9,10,11,12]  # gfortran versions to test
         python-version: [3.9]
     env:
       FC: gfortran-${{ matrix.gcc_v }}
@@ -23,11 +23,13 @@ jobs:
         submodules: recursive
 
     - name: Install Python
+      if: contains( matrix.gcc_v, 10 )
       uses: actions/setup-python@v4 # Use pip to install latest CMake, & FORD/Jin2For, etc.
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Setup Graphviz
+      if: contains( matrix.gcc_v, 10 )
       uses: ts-graphviz/setup-graphviz@v1
 
     - name: Setup Fortran Package Manager
@@ -36,14 +38,13 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install Python dependencies
-      if: contains( matrix.os, 'ubuntu')
+      if: contains( matrix.gcc_v, 10 )
       run: |
         python -m pip install --upgrade pip
         pip install ford numpy matplotlib
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
     - name: Install GFortran Linux
-      if: contains( matrix.os, 'ubuntu')
       run: |
         sudo apt-get install lcov
         sudo update-alternatives \
@@ -58,24 +59,28 @@ jobs:
       run: fpm test --profile debug --flag -coverage
 
     - name: Create coverage report
+      if: contains( matrix.gcc_v, 10 )
       run: |
         mkdir -p ${{ env.COV_DIR }}
-        lcov --capture --initial --base-directory . --directory build/gfortran_*/ --output-file ${{ env.COV_DIR }}/coverage.base
-        lcov --capture --base-directory . --directory build/gfortran_*/ --output-file ${{ env.COV_DIR }}/coverage.capture
+        mv ./build/gfortran_*/*/* ${{ env.COV_DIR }}
+        lcov --capture --initial --base-directory . --directory ${{ env.COV_DIR }} --output-file ${{ env.COV_DIR }}/coverage.base
+        lcov --capture           --base-directory . --directory ${{ env.COV_DIR }} --output-file ${{ env.COV_DIR }}/coverage.capture
         lcov --add-tracefile ${{ env.COV_DIR }}/coverage.base --add-tracefile ${{ env.COV_DIR }}/coverage.capture --output-file ${{ env.COV_DIR }}/coverage.info
       env:
         COV_DIR: build/coverage
 
     - name: Upload coverage report
+      if: contains( matrix.gcc_v, 10 )
       uses: codecov/codecov-action@v3
       with:
         files: build/coverage/coverage.info
 
     - name: Build documentation
+      if: contains( matrix.gcc_v, 10 )
       run: ford ./fortran-csv-module.md
 
     - name: Deploy Documentation
-      if: github.ref == 'refs/heads/master'
+      if: contains( matrix.gcc_v, 10 ) && github.ref == 'refs/heads/master'
       uses: JamesIves/[email protected]
       with:
         branch: gh-pages # The branch the action should deploy to.

files/test2.csv

@@ -0,0 +1,3 @@
+"header1", "header2"
+"text1",      -2.73
+"text2",       0.24

fpm.toml

@@ -17,6 +17,16 @@ name = "csv_test"
 source-dir = "src/tests"
 main = "csv_test.f90"
 
+[[test]]
+name = "csv_test2"
+source-dir = "src/tests"
+main = "csv_test2.f90"
+
+[[test]]
+name = "csv_test3"
+source-dir = "src/tests"
+main = "csv_test3.f90"
+
 [install]
 library = true
 

src/csv_module.F90

@@ -520,7 +520,7 @@ subroutine add_vector(me,val,int_fmt,real_fmt,trim_str)
 
     do i=1,size(val)
 
-#if defined __GFORTRAN__
+#if ( defined __GFORTRAN__ ) && ( __GNUC__ <= 10 )
         ! This is a stupid workaround for gfortran bugs (tested with 7.2.0)
         select type (val)
         type is (character(len=*))
@@ -966,7 +966,7 @@ subroutine get_column(me,icol,r,status_ok)
 
         do i=1,me%n_rows  ! row loop
 
-#if defined __GFORTRAN__
+#if ( defined __GFORTRAN__ ) && ( __GNUC__ <= 10 )
             ! the following is a workaround for gfortran bugs:
             select type (r)
             type is (character(len=*))

src/tests/csv_test2.f90

@@ -0,0 +1,28 @@
+
+
+!*****************************************************************************************
+!> author: Jacob Williams
+!  license: BSD
+!
+!  Test of reading a CSV file.
+
+    program csv_test2
+
+    use csv_module
+    use iso_fortran_env, only: wp => real64, sp => real32
+
+    implicit none
+
+    type(csv_file) :: file
+    logical        :: status_ok
+
+    write(*,*) ''
+    write(*,*) '============================'
+    write(*,*) ' csv_test_2 '
+    write(*,*) '============================'
+    write(*,*) ''
+
+    call file%read('files/test2.csv',header_row=1,status_ok=status_ok)
+    write(*,*) 'status_ok = ', status_ok
+
+end program csv_test2

src/tests/csv_test3.f90

@@ -0,0 +1,82 @@
+!*****************************************************************************************
+!>
+!  Test of string conversions that uncover bugs in Gfortran.
+
+    program csv_test3
+
+    use csv_module
+    use iso_fortran_env, only: wp => real64
+
+    implicit none
+
+    type(csv_file) :: f
+    logical :: status_ok
+    character(len=30),dimension(:),allocatable :: header, col1
+    integer :: i
+    character(len=100) :: tmp_str
+
+    write(*,*) ''
+    write(*,*) '============================'
+    write(*,*) ' csv_test_3 '
+    write(*,*) '============================'
+    write(*,*) ''
+
+    ! set optional inputs:
+    call f%initialize(verbose = .true.)
+
+    ! open the file
+    call f%open('test.csv',n_cols=4,status_ok=status_ok)
+
+    ! add header
+    call f%add(['x','y','z','t'])
+    call f%next_row()
+
+    ! add some data:
+    call f%add([1.0_wp,2.0_wp,3.0_wp],real_fmt='(F5.3)')
+    call f%add(.true.)
+    call f%next_row()
+    call f%add([2.0_wp,5.0_wp,6.0_wp],real_fmt='(F5.3)')
+    call f%add(.false.)
+    call f%next_row()
+    call f%add([3.0_wp,5.0_wp,6.0_wp],real_fmt='(F5.3)')
+    call f%add(.false.)
+    call f%next_row()
+    call f%add([4.0_wp,5.0_wp,6.0_wp],real_fmt='(F5.3)')
+    call f%add(.false.)
+    call f%next_row()
+    call f%add([5.0_wp,5.0_wp,6.0_wp],real_fmt='(F5.3)')
+    call f%add(.false.)
+    call f%next_row()
+
+    ! finished
+    call f%close(status_ok)
+    if (.not. status_ok) error stop 'error closing file'
+
+    ! read the file
+    call f%read('test.csv',header_row=1,status_ok=status_ok)
+    if (.not. status_ok) error stop 'error reading file'
+
+    ! get the header and type info
+    call f%get_header(header,status_ok)
+
+    print "(*(g0))", "HEADER:"
+    do i = 1, size(header)
+      print "(*(g0))", ">"//trim(header(i))//"<"
+    end do
+    if (.not. all(header == ['x','y','z','t'])) error stop 'error reading header'
+
+    call f%get(1,col1,status_ok)
+    print "(*(g0))", "col1:"
+    do i = 1, size(col1)
+      print "(*(g0))", ">",trim(col1(i)),"<"
+    end do
+
+    do i = 1, 5
+      write(tmp_str,'(F5.3)') real(i,wp)
+      if (col1(i) /= tmp_str) error stop 'error converting cell to string:'//tmp_str
+    end do
+
+    ! destroy the file
+    call f%destroy()
+
+    end program csv_test3