From f4591d329f4d987c6497bfaed0e10eb6d8283af0 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Fri, 14 Jul 2023 16:07:13 -0400 Subject: [PATCH 1/2] Add python 3.11 --- .github/workflows/conda-package.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 887ad4a9fa..615d373ada 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v3 with: @@ -63,7 +63,7 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11'] env: conda-bld: C:\Miniconda\conda-bld\win-64\ steps: @@ -102,7 +102,7 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11'] experimental: [false] runner: [ubuntu-20.04] continue-on-error: ${{ matrix.experimental }} @@ -185,7 +185,7 @@ jobs: shell: cmd /C CALL {0} strategy: matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11'] experimental: [false] runner: [windows-latest] continue-on-error: ${{ matrix.experimental }} @@ -300,7 +300,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11'] steps: - name: Download artifact uses: actions/download-artifact@v3 @@ -324,7 +324,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11'] steps: - name: Download artifact uses: actions/download-artifact@v3 From f3d9276ad0cb49e4be8b7fa33e567c851b92490e Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Thu, 20 Jul 2023 20:13:01 -0500 Subject: [PATCH 2/2] Allow DPCTL to build when intel-cmplr-lib-rt is absent from $PREFIX The change allows icpx to find these libraries in $BUILD_PREFIX --- conda-recipe/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 42797c4e4a..6826831639 100755 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -6,6 +6,9 @@ export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/compiler/lib/intel64_lin:$PREFIX/compiler/lib:$PREFIX/lib" +# This is necessary to help DPC++ find Intel libraries such as SVML, IRNG, etc in build prefix +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BUILD_PREFIX}/lib" + # Intel LLVM must cooperate with compiler and sysroot from conda echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg export ICPXCFG="$(pwd)/icpx_for_conda.cfg"