From 4e69c633234178395836cebb7383b6dfa063fb99 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 28 Oct 2024 09:51:15 -0700 Subject: [PATCH] CI: fix IntelLLVM builds --- .github/workflows/dependencies/dpcpp.sh | 5 ++++- .github/workflows/intel.yml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependencies/dpcpp.sh b/.github/workflows/dependencies/dpcpp.sh index 3b146405b4b..2ca89e03d3f 100755 --- a/.github/workflows/dependencies/dpcpp.sh +++ b/.github/workflows/dependencies/dpcpp.sh @@ -29,13 +29,16 @@ df -h # https://github.com/ECP-WarpX/WarpX/pull/1566#issuecomment-790934878 # try apt install up to five times, to avoid connection splits +# FIXME install latest version of IntelLLVM, Intel MKL +# after conflicts with openPMD are resolved status=1 for itry in {1..5} do sudo apt-get install -y --no-install-recommends \ build-essential \ cmake \ - intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mkl-devel \ + intel-oneapi-compiler-dpcpp-cpp=2024.2.1-1079 \ + intel-oneapi-mkl-devel=2024.2.1-103 \ g++ gfortran \ libopenmpi-dev \ openmpi-bin \ diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 170008d0672..9b98c6e5990 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -112,6 +112,7 @@ jobs: set +e source /opt/intel/oneapi/setvars.sh set -e + export PATH=$PATH:/opt/intel/oneapi/compiler/2024.2/bin # FIXME export CXX=$(which icpx) export CC=$(which icx) @@ -176,6 +177,7 @@ jobs: set +e source /opt/intel/oneapi/setvars.sh set -e + export PATH=$PATH:/opt/intel/oneapi/compiler/2024.2/bin # FIXME export CXX=$(which icpx) export CC=$(which icx) export CXXFLAGS="-fsycl ${CXXFLAGS}"