Merge pull request #19 from FluidNumerics/bugfix/issue-16

Add -check all, nouninit flag to debug fpm build with ifx compilers
FluidNumerics · Dec 6, 2023 · 91f35dd · 91f35dd
2 parents a24f43a + 28b1273
commit 91f35dd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ env:
 
 jobs:
   test:
-    timeout-minutes: 5
+    timeout-minutes: 8
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     name: ${{ matrix.os_name }} - ${{ matrix.fcompiler }} - ${{ matrix.build_type }}
     runs-on: ${{ matrix.os }}
@@ -107,12 +107,12 @@ jobs:
               shell: bash
               build_type: fpm
 
-            # - os: ubuntu-22.04
-            #   os_name: linux
-            #   fcompiler: ifx
-            #   ccompiler: icx-cc
-            #   shell: bash
-            #   build_type: fpm
+            - os: ubuntu-22.04
+              os_name: linux
+              fcompiler: ifx
+              ccompiler: icx-cc
+              shell: bash
+              build_type: fpm
 
             - os: ubuntu-22.04
               os_name: linux
@@ -187,8 +187,17 @@ jobs:
           FC=${{ matrix.fcompiler }} CC=${{ matrix.ccompiler }} cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}  ../
           make VERBOSE=1
 
-      - name: fpm tests
-        if: ${{ matrix.build_type == 'fpm' }}
+      - name: fpm tests (ifx)
+        if: ${{ (matrix.build_type == 'fpm') && (matrix.fcompiler == 'ifx') }}
+        run: |
+          wget https://github.com/fortran-lang/fpm/releases/download/v0.9.0/fpm-0.9.0-linux-x86_64
+          chmod +x ./fpm-0.9.0-linux-x86_64 && mv ./fpm-0.9.0-linux-x86_64 fpm
+          ./fpm install --compiler ${{ matrix.fcompiler }} --c-compiler ${{ matrix.ccompiler }} --flag "-debug all -check all,nouninit -traceback"
+          ./fpm test --compiler ${{ matrix.fcompiler }} --c-compiler ${{ matrix.ccompiler }} --flag "-debug all -check all,nouninit -traceback"
+          ./fpm run --compiler ${{ matrix.fcompiler }} --c-compiler ${{ matrix.ccompiler }} --flag "-debug all -check all,nouninit -traceback" --example "*"
+
+      - name: fpm tests (not ifx)
+        if: ${{ (matrix.build_type == 'fpm') && (matrix.fcompiler != 'ifx') }}
         run: |
           wget https://github.com/fortran-lang/fpm/releases/download/v0.9.0/fpm-0.9.0-linux-x86_64
           chmod +x ./fpm-0.9.0-linux-x86_64 && mv ./fpm-0.9.0-linux-x86_64 fpm

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ elseif( "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Intel" )
 
 elseif( "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "IntelLLVM" )
     set( CMAKE_Fortran_FLAGS "-fpp" )
-    set( CMAKE_Fortran_FLAGS_DEBUG "-debug all" )
+    set( CMAKE_Fortran_FLAGS_DEBUG "-debug all -check all,nouninit -traceback" )
     set( CMAKE_Fortran_FLAGS_COVERAGE "${CMAKE_Fortran_FLAGS_DEBUG}") # Code coverage not available with ifx
     set( CMAKE_Fortran_FLAGS_PROFILE "-O3")
     set( CMAKE_Fortran_FLAGS_RELEASE "-O3" )