Merge pull request #109 from browsermt/graemenail-actions-fix-mkl

Fix MKL in CI
browsermt · Dec 7, 2023 · 831a736 · 831a736
2 parents 02f2f73 + 3852f9b
commit 831a736
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -17,6 +17,7 @@ jobs:
             os: ubuntu-20.04
             cuda: "11.2"
             gcc: 9
+            clang: ""
             cpu: true
             gpu: true
             unit_tests: false
@@ -25,6 +26,7 @@ jobs:
             os: ubuntu-20.04
             cuda: "11.2"
             gcc: 9
+            clang: ""
             cpu: true
             gpu: false
             unit_tests: false
@@ -48,6 +50,15 @@ jobs:
             gpu: false
             unit_tests: false
             examples: false
+          - name: "Ubuntu 22.04 clang-14 CPU"
+            os: ubuntu-22.04
+            cuda: ""
+            gcc: ""
+            clang: 14
+            cpu: true
+            gpu: false
+            unit_tests: true
+            examples: false
 
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.name }}
@@ -62,12 +73,14 @@ jobs:
     # No need to install libprotobuf{17,10,9v5} on Ubuntu {20,18,16}.04 because it is installed together with libprotobuf-dev
     # Boost is no longer pre-installed on GitHub-hosted runners
     - name: Install dependencies
-      run: sudo apt-get install -y libunwind-dev libgoogle-perftools-dev libprotobuf-dev protobuf-compiler libboost-system-dev g++-${{ matrix.gcc }}
+      run: |
+        sudo apt-get install -y libunwind-dev libgoogle-perftools-dev libprotobuf-dev protobuf-compiler libboost-system-dev
+        [ -z "${{ matrix.gcc }}" ] || sudo apt-get install -y gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
 
     # https://software.intel.com/content/www/us/en/develop/articles/installing-intel-free-libs-and-python-apt-repo.html
     - name: Install MKL
       run: |
-        wget -qO- "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB" | sudo apt-key add -
+        wget -qO- "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" | sudo apt-key add -
         sudo sh -c "echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list"
         sudo apt-get update -o Dir::Etc::sourcelist="/etc/apt/sources.list.d/intel-mkl.list"
         sudo apt-get install -y --no-install-recommends intel-mkl-64bit-2020.0-088
@@ -81,9 +94,10 @@ jobs:
     # https://github.com/actions/virtual-environments/issues/687#issuecomment-610471671
     - name: Configure CMake
       run: |
+        [ -z "${{ matrix.gcc }}" ] || export CC=/usr/bin/gcc-${{ matrix.gcc }} CXX=/usr/bin/g++-${{ matrix.gcc }} CUDAHOSTCXX=/usr/bin/g++-${{ matrix.gcc }}
+        [ -z "${{ matrix.clang }}" ] || export CC=/usr/bin/clang-${{ matrix.clang }} CXX=/usr/bin/clang++-${{ matrix.clang }}
         mkdir -p build
         cd build
-        CC=/usr/bin/gcc-${{ matrix.gcc }} CXX=/usr/bin/g++-${{ matrix.gcc }} CUDAHOSTCXX=/usr/bin/g++-${{ matrix.gcc }} \
         cmake .. \
           -DBoost_ARCHITECTURE=-x64 \
           -DCMAKE_BUILD_TYPE=Release \