From ef130003f83c895e5dce500ce5667a3682a645f4 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Mon, 3 Jun 2024 11:49:23 -0500 Subject: [PATCH] enabling intel (#545) * enabling intel * making windows tests run again --- .github/workflows/docker_and_coverage.yml | 2 +- .github/workflows/windows.yml | 5 ----- docker/Dockerfile.intel | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker_and_coverage.yml b/.github/workflows/docker_and_coverage.yml index f9582209a..9c466b05f 100644 --- a/.github/workflows/docker_and_coverage.yml +++ b/.github/workflows/docker_and_coverage.yml @@ -22,7 +22,7 @@ jobs: - Dockerfile.no_json - Dockerfile.nvhpc - Dockerfile.openmp - # - Dockerfile.intel Disabling until #541 is fixed + - Dockerfile.intel # - Dockerfile.mpi steps: - name: Checkout code diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 626678b86..2d9dc98a8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,7 +8,6 @@ concurrency: jobs: mingw: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: windows-2019 strategy: matrix: @@ -34,7 +33,6 @@ jobs: ctest -C Debug --rerun-failed --output-on-failure . --verbose msvc2019: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: windows-2019 strategy: matrix: @@ -54,7 +52,6 @@ jobs: run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure msvc2022: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: windows-2022 strategy: matrix: @@ -71,7 +68,6 @@ jobs: run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure clang: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: windows-2019 strategy: matrix: @@ -89,7 +85,6 @@ jobs: run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure clang-cl-11: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: windows-2019 strategy: matrix: diff --git a/docker/Dockerfile.intel b/docker/Dockerfile.intel index 70fb8e9b8..3c9f891e1 100644 --- a/docker/Dockerfile.intel +++ b/docker/Dockerfile.intel @@ -1,6 +1,12 @@ # versions and sizes from here: https://hub.docker.com/r/intel/oneapi-hpckit/tags FROM intel/oneapi-hpckit:latest +# Based off of this: https://dgpu-docs.intel.com/driver/installation.html#repository-public-key-used-for-package-and-repository-signing +# however those docs (at the time of this writing are incorrect) and this is the correct url +# community.intel.com/t5/Intel-oneAPI-Math-Kernel-Library/Cannot-update-any-packages-using-intel-oneapi-hpckit-latest/m-p/1603192#M36169 +RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \ + gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics-archive-keyring.gpg + RUN apt update \ && apt -y install \ build-essential \