no strict aliasing typo fix

scivision · May 16, 2024 · afa0842 · afa0842
1 parent cbdf7fc
commit afa0842
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,26 +31,35 @@ jobs:
         scotch: [false]
         metis: [false]
         lapack_vendor: [""]
-        img: [ {os: ubuntu-latest, cmd: sudo apt update && sudo apt install --no-install-recommends libopenmpi-dev openmpi-bin},
-               {os: macos-latest, cmd: brew install open-mpi}
-        ]
+        os: [ubuntu-24.04, macos-latest]
         include:
           - scotch: true
-            img: {os: ubuntu-latest, cmd: sudo apt update && sudo apt install --no-install-recommends libopenmpi-dev openmpi-bin}
+            os: ubuntu-24.04
           - metis: true
-            img: {os: ubuntu-latest, cmd: sudo apt update && sudo apt install --no-install-recommends libopenmpi-dev openmpi-bin}
+            os: ubuntu-24.04
           - lapack_vendor: "OpenBLAS"
-            img: {os: ubuntu-latest, cmd: sudo apt update && sudo apt install --no-install-recommends libopenmpi-dev openmpi-bin libopenblas-dev}
+            os: ubuntu-24.04
 
-    runs-on: ${{ matrix.img.os }}
+    runs-on: ${{ matrix.os }}
 
     env:
-      FC: gfortran-12
+      FC: gfortran-13
 
     steps:
 
-    - name: Install prereqs
-      run: ${{ matrix.img.cmd }}
+    - name: Install prereqs (Linux)
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt update
+        sudo apt install --no-install-recommends libopenmpi-dev openmpi-bin liblapack-dev
+
+    - name: Install prereqs (macOS)
+      if: runner.os == 'macOS'
+      run: brew install open-mpi
+
+    - name: Install OpenBLAS (Linux)
+      if: ${{ matrix.lapack_vendor == 'OpenBLAS' }}
+      run: sudo apt install --no-install-recommends libopenblas-dev
 
     - uses: actions/checkout@v4
 

diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake
@@ -23,8 +23,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "^Intel")
   endif()
 
   add_compile_options($<$<COMPILE_LANG_AND_ID:C,IntelLLVM>:$<IF:$<BOOL:${WIN32}>,/Qopenmp,-fiopenmp>>)
- elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang|GNU")
-  add_compile_options($<$<COMPILE_LANGUAGE:C>:-Werror-implicit-function-declaration;-fno-strict-aliasing>)
+ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
+  add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Werror-implicit-function-declaration;-fno-strict-aliasing>")
 endif()