diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 5cbdcbf571..42189e6c9b 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - python: [3.8] + python: [3.8, 3.9] steps: - uses: actions/checkout@v2 with: @@ -57,7 +57,7 @@ jobs: strategy: matrix: - python: [3.8] + python: [3.8, 3.9] env: conda-bld: C:\Miniconda\conda-bld\win-64\ steps: @@ -96,7 +96,7 @@ jobs: strategy: matrix: - python: [3.8] + python: [3.8, 3.9] experimental: [false] runner: [ubuntu-latest] # include: @@ -160,7 +160,7 @@ jobs: strategy: matrix: - python: [3.8] + python: [3.8, 3.9] experimental: [false] runner: [windows-latest] continue-on-error: ${{ matrix.experimental }} @@ -216,7 +216,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.8] + python: [3.8, 3.9] steps: - name: Download artifact uses: actions/download-artifact@v2 @@ -241,7 +241,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python: [3.8] + python: [3.8, 3.9] steps: - name: Download artifact uses: actions/download-artifact@v2 diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 37ae591486..777bc6f513 100755 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -3,10 +3,15 @@ # Workaround to Klocwork overwriting LD_LIBRARY_PATH that was modified # by DPC++ compiler conda packages. Will need to be added to DPC++ compiler # activation scripts. -export LDFLAGS="$LDFLAGS -Wl,-rpath,$CONDA_PREFIX/lib" +export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib" ${PYTHON} setup.py clean --all -INSTALL_CMD="install --sycl-compiler-prefix=$CONDA_PREFIX" +INSTALL_CMD="install --sycl-compiler-prefix=$BUILD_PREFIX" + +# Workaround for: +# DPC++ launched by cmake does not see components of `dpcpp_cpp_rt`, +# because conda build isolates LD_LIBRARY_PATH to only $PREFIX subfolders. +export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$BUILD_PREFIX/lib if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then # Install packages and assemble wheel package from built bits diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 77c7814890..ce4da0b65a 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -22,7 +22,7 @@ requirements: - python - make # [unix] - ninja # [win] - - numpy >=1.17 # [win or osx or py==38] + - numpy >=1.17 # [win or osx or py>=38] - numpy 1.17 # [linux and py==37] - wheel run: