[CI] Add NVIDIA-HPC compilers

ralna · Jan 11, 2024 · 10b38c1 · 10b38c1
1 parent e723071
commit 10b38c1
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 72 deletions.
diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
@@ -7,41 +7,45 @@ on:
     types: [opened, synchronize, reopened]
 jobs:
   build:
-    name: SPRAL/${{ matrix.os }}/${{ matrix.fc_cmd }}/${{ matrix.compiler_version }}/METIS ${{ matrix.metis }}
+    name: SPRAL/${{ matrix.os }}/${{ matrix.compiler }}/${{ matrix.version }}/METIS ${{ matrix.metis }}
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        compiler_version: [12]
+        version: ['12']
         metis: [32, 64]
         include:
-          - compiler: gnu
-            cc_cmd: gcc
-            fc_cmd: gfortran
-            cxx_cmd: g++
+          - compiler: gcc
           - os: ubuntu-latest
-            compiler: intel-llvm
-            compiler_version: 2023.2
-            cc_cmd: icx
-            fc_cmd: ifort
-            cxx_cmd: icpx
+            compiler: intel
+            version: '2023.2'
             metis: 32
             allow_failure: true
           - os: ubuntu-latest
-            compiler: intel-llvm
-            compiler_version: 2023.2
-            cc_cmd: icx
-            fc_cmd: ifort
-            cxx_cmd: icpx
+            compiler: intel
+            version: '2023.2'
             metis: 64
             allow_failure: true
-          # - os: ubuntu-latest
-          #   compiler: intel-llvm
-          #   compiler_version: 2023.2
-          #   cc_cmd: icx
-          #   fc_cmd: ifx
-          #   cxx_cmd: icpx
+          # - os: windows-latest
+          #   compiler: intel
+          #   version: '2023.2'
+          #   metis: 32
           #   allow_failure: true
+          # - os: windows-latest
+          #   compiler: intel
+          #   version: '2023.2'
+          #   metis: 64
+          #   allow_failure: true
+          - os: ubuntu-latest
+            compiler: nvidia-hpc
+            version: '23.11'
+            metis: 32
+            allow_failure: true
+          - os: ubuntu-latest
+            compiler: nvidia-hpc
+            version: '23.11'
+            metis: 64
+            allow_failure: true
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out SPRAL
@@ -85,12 +89,14 @@ jobs:
             cp deps/$LIBDIR/metis/metis_Int64_Real32/include/metis.h deps/include/metis.h
             cp deps/$LIBDIR/metis/metis_Int64_Real32/$LIBDIR/libmetis_Int64_Real32.$DLEXT deps/$LIBDIR/libmetis_Int64_Real32.$DLEXT
           fi
-          wget https://github.com/JuliaBinaryWrappers/OpenBLAS32_jll.jl/releases/download/OpenBLAS32-v0.3.23%2B0/OpenBLAS32.v0.3.23.$PLATFORM-libgfortran5.tar.gz
-          tar -xzvf OpenBLAS32.v0.3.23.$PLATFORM-libgfortran5.tar.gz -C deps
-          wget https://github.com/JuliaBinaryWrappers/Hwloc_jll.jl/releases/download/Hwloc-v2.9.3%2B0/Hwloc.v2.9.3.$PLATFORM.tar.gz
-          tar -xzvf Hwloc.v2.9.3.$PLATFORM.tar.gz -C deps
-          wget https://github.com/JuliaBinaryWrappers/MKL_jll.jl/releases/download/MKL-v2023.2.0%2B0/MKL.v2023.2.0.$PLATFORM.tar.gz
-          tar -xzvf MKL.v2023.2.0.$PLATFORM.tar.gz -C deps
+          wget https://github.com/JuliaBinaryWrappers/OpenBLAS32_jll.jl/releases/download/OpenBLAS32-v0.3.26%2B0/OpenBLAS32.v0.3.26.$PLATFORM-libgfortran5.tar.gz
+          tar -xzvf OpenBLAS32.v0.3.26.$PLATFORM-libgfortran5.tar.gz -C deps
+          wget https://github.com/JuliaBinaryWrappers/Hwloc_jll.jl/releases/download/Hwloc-v2.10.0%2B0/Hwloc.v2.10.0.$PLATFORM.tar.gz
+          tar -xzvf Hwloc.v2.10.0.$PLATFORM.tar.gz -C deps
+          if [[ "${{matrix.os}}" != "macos-latest" ]]; then
+            wget https://github.com/JuliaBinaryWrappers/MKL_jll.jl/releases/download/MKL-v2024.0.0%2B0/MKL.v2024.0.0.$PLATFORM.tar.gz
+            tar -xzvf MKL.v2024.0.0.$PLATFORM.tar.gz -C deps
+          fi
           rm *.tar.gz
 
       - name: Set environment variables for OpenMP
@@ -99,26 +105,16 @@ jobs:
           echo "OMP_CANCELLATION=TRUE" >> $GITHUB_ENV
           echo "OMP_PROC_BIND=TRUE" >> $GITHUB_ENV
 
-      - name: Install GNU compilers
-        if: matrix.compiler == 'gnu'
-        uses: awvwgk/setup-fortran@main
+      - name: Install compilers
+        uses: fortran-lang/setup-fortran@main
         with:
-          compiler: gcc
-          version: ${{ matrix.compiler_version }}
+          compiler: ${{ matrix.compiler }}
+          version: ${{ matrix.version }}
 
-      - name: Install classic Intel compilers
+      - name: Update Intel compilers
         if: matrix.compiler == 'intel'
-        uses: awvwgk/setup-fortran@main
-        with:
-          compiler: intel-classic
-          version: ${{ matrix.compiler_version }}
-
-      - name: Install nextgen Intel compilers
-        if: matrix.compiler == 'intel-llvm'
-        uses: awvwgk/setup-fortran@main
-        with:
-          compiler: intel
-          version: ${{ matrix.compiler_version }}
+        shell: bash
+        run: echo "FC=ifort" >> $GITHUB_ENV
 
       # Uncomment this section to obtain ssh access to VM
       # - name: Setup tmate session
@@ -133,6 +129,10 @@ jobs:
           LIBHWLOC="hwloc"
           LIBMETIS="metis"
           METIS64="false"
+          LIBBLAS="openblas"
+          LIBLAPACK="openblas"
+          CSTD="c99"
+          CPPSTD="c++11"
           if [[ "${{matrix.os}}" == "windows-latest" ]]; then
             LIBDIR="bin"
             LIBHWLOC="hwloc-15"
@@ -141,29 +141,22 @@ jobs:
             LIBMETIS="metis_Int64_Real32"
             METIS64="true"
           fi
-          if [[ "${{matrix.compiler}}" == "gnu" ]]; then
-            meson setup builddir --prefix=$GITHUB_WORKSPACE/../meson --buildtype=debug \
-                                 -Dexamples=true -Dtests=true \
-                                 -Dlibmetis_path=$DEPS/deps/$LIBDIR -Dlibmetis=$LIBMETIS \
-                                 -Dmetis64=$METIS64 -Dlibblas_path=$DEPS/deps/$LIBDIR \
-                                 -Dlibblas=openblas -Dlibblas_include=../deps/include \
-                                 -Dliblapack_path=$DEPS/deps/$LIBDIR -Dliblapack=openblas \
-                                 -Dlibhwloc_path=$DEPS/deps/$LIBDIR -Dlibhwloc=$LIBHWLOC \
-                                 -Dlibhwloc_include=../deps/include
-          else
-            meson setup builddir --prefix=$GITHUB_WORKSPACE/../meson --buildtype=debug \
-                                 -Dexamples=true -Dtests=true \
-                                 -Dlibmetis_path=$DEPS/deps/$LIBDIR -Dlibmetis=$LIBMETIS \
-                                 -Dmetis64=$METIS64 -Dlibblas_path=$DEPS/deps/$LIBDIR \
-                                 -Dlibblas=mkl_rt -Dlibblas_include=../deps/include \
-                                 -Dliblapack_path=$DEPS/deps/$LIBDIR -Dliblapack=mkl_rt \
-                                 -Dlibhwloc_path=$DEPS/deps/$LIBDIR -Dlibhwloc=$LIBHWLOC \
-                                 -Dlibhwloc_include=../deps/include -Dlibmetis=$LIBMETIS
+          if [[ "${{matrix.compiler}}" == "intel" ]]; then
+            LIBBLAS="mkl_rt"
+            LIBLAPACK="mkl_rt"
+          fi
+          if [[ "${{matrix.compiler}}" == "nvidia-hpc" ]]; then
+            CSTD="none"
+            CPPSTD="none"
           fi
-        env:
-          CC: ${{ matrix.cc_cmd }}
-          FC: ${{ matrix.fc_cmd }}
-          CXX: ${{ matrix.cxx_cmd }}
+          meson setup builddir --prefix=$GITHUB_WORKSPACE/../meson --buildtype=debug \
+                               -Dexamples=true -Dtests=true \
+                               -Dlibmetis_path=$DEPS/deps/$LIBDIR -Dlibmetis=$LIBMETIS \
+                               -Dmetis64=$METIS64 -Dlibblas_path=$DEPS/deps/$LIBDIR \
+                               -Dlibblas=$LIBBLAS -Dlibblas_include=../deps/include \
+                               -Dliblapack_path=$DEPS/deps/$LIBDIR -Dliblapack=$LIBLAPACK \
+                               -Dlibhwloc_path=$DEPS/deps/$LIBDIR -Dlibhwloc=$LIBHWLOC \
+                               -Dlibhwloc_include=../deps/include -Dc_std=$CSTD -Dcpp_std=$CPPSTD \
 
       - name: Build SPRAL
         shell: bash
@@ -172,7 +165,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: ${{ matrix.os }}_${{ matrix.fc_cmd }}_${{ matrix.compiler_version }}_METIS_${{ matrix.metis }}_meson-log.txt
+          name: ${{ matrix.os }}_${{ matrix.compiler }}_${{ matrix.version }}_METIS_${{ matrix.metis }}_meson-log.txt
           path: builddir/meson-logs/meson-log.txt
 
       - name: Install SPRAL
@@ -182,7 +175,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: ${{ matrix.os }}_${{ matrix.fc_cmd }}_${{ matrix.compiler_version }}_METIS_${{ matrix.metis }}_install-log.txt
+          name: ${{ matrix.os }}_${{ matrix.compiler }}_${{ matrix.version }}_METIS_${{ matrix.metis }}_install-log.txt
           path: builddir/meson-logs/install-log.txt
 
       - name: Test SPRAL
@@ -192,5 +185,5 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: ${{ matrix.os }}_${{ matrix.fc_cmd }}_${{ matrix.compiler_version }}_METIS_${{ matrix.metis }}_testlog.txt
+          name: ${{ matrix.os }}_${{ matrix.compiler }}_${{ matrix.version }}_METIS_${{ matrix.metis }}_testlog.txt
           path: builddir/meson-logs/testlog.txt
diff --git a/meson.build b/meson.build
@@ -85,7 +85,10 @@ if host_machine.system() == 'linux'
 endif
 
 # OpenMP
-if fc.get_id() == 'nagfor'
+if fc.get_id() == 'nvidia_hpc'
+  add_global_arguments('-mp', language : 'fortran')
+  add_global_link_arguments('-mp', language : 'fortran')
+elif fc.get_id() == 'nagfor'
   add_global_arguments('-openmp', language : 'fortran')
   add_global_link_arguments('-openmp', language : 'fortran')
 elif fc.get_id() == 'gcc'
@@ -98,7 +101,10 @@ elif fc.get_id() == 'intel-cl' or fc.get_id() == 'intel-llvm-cl'
   add_global_arguments('/Qopenmp', language : 'fortran')
 endif
 
-if cxx.get_id() == 'gcc' or cxx.get_id() == 'clang'
+if cxx.get_id() == 'nvidia_hpc'
+  add_global_arguments('-mp', language : 'cpp')
+  add_global_link_arguments('-mp', language : 'cpp')
+elif cxx.get_id() == 'gcc' or cxx.get_id() == 'clang'
   add_global_arguments('-fopenmp', language : 'cpp')
   add_global_link_arguments('-fopenmp', language : 'cpp')
 elif cxx.get_id() == 'intel' or cxx.get_id() == 'intel-cl'