From 18fa029dc437b788bfd859c42218003adaeb31e9 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Tue, 28 Sep 2021 10:20:43 +0300 Subject: [PATCH 1/6] Use Python 3.9 in CI --- .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 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 From 763fcbdd4835c81c52e1dc5a982b830c5190de81 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Tue, 28 Sep 2021 10:36:47 +0300 Subject: [PATCH 2/6] Fix numpy version --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From d1ffeb648d4fe3f55bb18c518d95814fedcb8030 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Tue, 28 Sep 2021 12:24:09 +0300 Subject: [PATCH 3/6] Remove intel channel --- .github/workflows/conda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 42189e6c9b..9a63908f8a 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -38,7 +38,7 @@ jobs: run: conda install conda-build - name: Build conda package run: | - CHANNELS="-c intel -c defaults --override-channels" + CHANNELS="-c defaults --override-channels" VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" conda build \ From b545096d1251d2e50ad49045572d7b8bc9a5eea4 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 29 Sep 2021 18:08:39 +0300 Subject: [PATCH 4/6] Revert "Remove intel channel" This reverts commit d1ffeb648d4fe3f55bb18c518d95814fedcb8030. --- .github/workflows/conda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 9a63908f8a..42189e6c9b 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -38,7 +38,7 @@ jobs: run: conda install conda-build - name: Build conda package run: | - CHANNELS="-c defaults --override-channels" + CHANNELS="-c intel -c defaults --override-channels" VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" conda build \ From 8cba97c54e2ca49e5d4e70c157d893f918435262 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 29 Sep 2021 18:08:24 +0300 Subject: [PATCH 5/6] Use `dpcpp_cpp_rt` in host requirements --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ce4da0b65a..d4d359415e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -16,6 +16,7 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('dpcpp') }} # [not osx] host: + - dpcpp_cpp_rt # [py==39] - setuptools - cython - cmake From 6a28593fcda1e2ef7124cf6c3cb6e232325571a6 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Thu, 30 Sep 2021 11:54:27 +0300 Subject: [PATCH 6/6] Fix build.sh script for using corect PREFIX --- conda-recipe/build.sh | 9 +++++++-- conda-recipe/meta.yaml | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) 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 d4d359415e..ce4da0b65a 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -16,7 +16,6 @@ requirements: - {{ compiler('cxx') }} - {{ compiler('dpcpp') }} # [not osx] host: - - dpcpp_cpp_rt # [py==39] - setuptools - cython - cmake