Add IntelLLVM support (#252)

* Add IntelLLVM support * Use develop version for Intel CI * Set t after loop to avoid array out of bounds
NOAA-EMC · Aug 23, 2023 · 9ce4204 · 9ce4204
1 parent 33a8878
commit 9ce4204
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/Intel.yml b/.github/workflows/Intel.yml
@@ -21,9 +21,9 @@ defaults:
 jobs:
   Intel:
     runs-on: ubuntu-latest
-    env:
-      CC: icc
-      FC: ifort
+    strategy:
+      matrix:
+        compilers: ["CC=icc FC=ifort", "CC=icx FC=ifx"]
 
     steps:
 
@@ -44,7 +44,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/jasper
-        key: jasper-Intel-2.0.33
+        key: jasper-Intel-${{ matrix.compilers }}-2.0.33
 
     - name: checkout-jasper
       if: steps.cache-jasper.outputs.cache-hit != 'true'
@@ -59,7 +59,7 @@ jobs:
       run: |
         cd jasper
         mkdir b && cd b
-        cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper
+        ${{ matrix.compilers }} cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper
         make -j2
         make install
 
@@ -68,22 +68,22 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/bacio
-        key: bacio-Intel-${{ runner.os }}-v2.5.0
+        key: bacio-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
 
     - name: checkout-bacio
       if: steps.cache-bacio.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: NOAA-EMC/NCEPLIBS-bacio
         path: bacio
-        ref: v2.5.0
+        ref: develop
 
     - name: build-bacio
       if: steps.cache-bacio.outputs.cache-hit != 'true'
       run: |
         cd bacio
         mkdir build && cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio
+        ${{ matrix.compilers }} cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio
         make -j2
         make install
 
@@ -92,23 +92,23 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/sp
-        key: sp-Intel-${{ runner.os }}-2.3.3-1
+        key: sp-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
 
     - name: checkout-sp
       if: steps.cache-sp.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: NOAA-EMC/NCEPLIBS-sp
         path: sp
-        ref: v2.3.3
+        ref: develop
 
     - name: build-sp
       if: steps.cache-sp.outputs.cache-hit != 'true'
       run: |
         cd sp
         mkdir build
         cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=~/sp
+        ${{ matrix.compilers }} cmake .. -DCMAKE_INSTALL_PREFIX=~/sp
         make -j2
         make install
           
@@ -117,23 +117,23 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/w3emc
-        key: w3emc-Intel-${{ runner.os }}-2.10.0-bacio-2.5.0
+        key: w3emc-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
 
     - name: checkout-w3emc
       if: steps.cache-w3emc.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: NOAA-EMC/NCEPLIBS-w3emc
         path: w3emc
-        ref: v2.10.0
+        ref: develop
 
     - name: build-w3emc
       if: steps.cache-w3emc.outputs.cache-hit != 'true'
       run: |
         cd w3emc
         mkdir build
         cd build
-        cmake -DBUILD_WITH_BUFR=OFF -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc ..
+        ${{ matrix.compilers }} cmake -DBUILD_WITH_BUFR=OFF -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc ..
         make -j2
         make install
           
@@ -142,23 +142,23 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/ip
-        key: ip-Intel-${{ runner.os }}-4.1.0
+        key: ip-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
 
     - name: checkout-ip
       if: steps.cache-ip.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: NOAA-EMC/NCEPLIBS-ip
         path: ip
-        ref: v4.1.0
+        ref: develop
 
     - name: build-ip
       if: steps.cache-ip.outputs.cache-hit != 'true'
       run: |
         cd ip
         mkdir build
         cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp
+        ${{ matrix.compilers }} cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp
         make -j2
         make install
           
@@ -167,23 +167,23 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/g2
-        key: g2-Intel-${{ runner.os }}-2.0.33-2.5.0-3.4.5
+        key: g2-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
 
     - name: checkout-g2
       if: steps.cache-g2.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: NOAA-EMC/NCEPLIBS-g2
         path: g2
-        ref: v3.4.5
+        ref: develop
 
     - name: build-g2
       if: steps.cache-g2.outputs.cache-hit != 'true'
       run: |
         cd g2
         mkdir build
         cd build
-        cmake -DCMAKE_INSTALL_PREFIX=~/g2 -DCMAKE_PREFIX_PATH="~/bacio;~/jasper" ..
+        ${{ matrix.compilers }} cmake -DCMAKE_INSTALL_PREFIX=~/g2 -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/w3emc" ..
         make -j2
         make install
                  
@@ -196,7 +196,6 @@ jobs:
       run: |
         cd grib_utils
         mkdir build && cd build
-        cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2" -DCMAKE_Fortran_FLAGS="-heap-arrays" ..
+        ${{ matrix.compilers }} cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2" -DCMAKE_Fortran_FLAGS="-heap-arrays" ..
         make -j2
         ctest --output-on-failure --rerun-failed --verbose
-
diff --git a/src/cnvgrib/CMakeLists.txt b/src/cnvgrib/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Mark Potts, Kyle Gerheiser
 
 # Set compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/copygb/CMakeLists.txt b/src/copygb/CMakeLists.txt
@@ -4,7 +4,7 @@
 # George Gayno, Mark Potts
 
 # Set the compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -r8 -auto ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/copygb2/CMakeLists.txt b/src/copygb2/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Mark Potts, Kyle Gerheiser
 
 # Set compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -r8 -auto -convert big_endian -fpp ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/degrib2/CMakeLists.txt b/src/degrib2/CMakeLists.txt
@@ -4,7 +4,7 @@
 # George Gayno, Mark Potts
 
 # Set compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -convert big_endian -axCORE-AVX2 -fpp ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/grb2index/CMakeLists.txt b/src/grb2index/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Mark Potts, Kyle Gerheiser
 
 # Set compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -convert big_endian -axCORE-AVX2 -fpp ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/grbindex/CMakeLists.txt b/src/grbindex/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # George Gayno, Mark Potts
 
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS
       "-g -assume noold_ldout_format -convert big_endian -axCORE-AVX2 -fpp ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")

diff --git a/src/tocgrib/CMakeLists.txt b/src/tocgrib/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Mark Potts, Kyle Gerheiser
 
 # Set compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -assume noold_ldout_format -axCORE-AVX2 ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/tocgrib2/CMakeLists.txt b/src/tocgrib2/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Mark Potts, Kyle Gerheiser
 
 # Set the compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -axCORE-AVX2 ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/src/tocgrib2super/CMakeLists.txt b/src/tocgrib2super/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Mark Potts, Kyle Gerheiser
 
 # Set the compiler flags.
-if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM)$")
   set(CMAKE_Fortran_FLAGS "-g -assume noold_ldout_format -axCORE-AVX2 ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 ${CMAKE_Fortran_FLAGS}")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")

diff --git a/tests/test_degrib2_int.F90 b/tests/test_degrib2_int.F90
@@ -135,6 +135,8 @@ program test_degrib2_int
      pt(iutpos(t)) = 0
   end do
 
+  t = NUM_TN_T
+
   ! Check different units for secondary times.
   pt(iutpos(t)) = 99
   pt(33) = 2