From e05bb9aa67cba7de4047aa550daeb0efe6913f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Wed, 15 May 2024 10:44:18 +0200 Subject: [PATCH] [pypi] mkl CI variable --- .github/workflows/cmake.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index fd7feba..111317a 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -7,7 +7,7 @@ on: [push] env: VCPKG_REVISION: "943c5ef1c8f6b5e6ced092b242c8299caae2ff01" PMM_VERSION: "2.1.0" - MKL_VERSION: "2024.1" + MKL_VERSION: "intel-oneapi-mkl-devel-2024.1" jobs: create_release: @@ -53,7 +53,6 @@ jobs: cmakeargs: -DTEST:BOOL=FALSE -DUSE_MKL:BOOL=FALSE -DMAKE_STATIC_EXE:BOOL=TRUE -DVCPKG_TARGET_TRIPLET:STRING=x64-windows-static -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja - os: ubuntu-latest shortos: linux - mkl-version: intel-oneapi-mkl-devel-${{ env.MKL_VERSION }} cmakeargs: "-DTEST:BOOL=FALSE -DUSE_MKL:BOOL=TRUE -DMAKE_STATIC_EXE:BOOL=TRUE -DLAPACK_ROOT:STRING=/opt/intel/oneapi/mkl/latest/lib '-DLAPACK_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl' '-DBLAS_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl' -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja" - os: macos-latest shortos: macos @@ -92,7 +91,7 @@ jobs: uses: actions/cache@v2 with: path: /opt/intel - key: ${{ matrix.mkl-version }} + key: ${{ env.mkl-version }} if: matrix.os == 'ubuntu-latest' - name: setup x64-linux run: | @@ -100,7 +99,7 @@ jobs: wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update - sudo apt-get install -y ${{ matrix.mkl-version }} + sudo apt-get install -y ${{ env.mkl-version }} fi echo "CC=gcc-13" >> $GITHUB_ENV echo "CXX=g++-13" >> $GITHUB_ENV