Skip to content

Commit 6d005b2

Browse files
authored
Use Python 3.9 [in public CI] (#599)
* Use Python 3.9 in CI * Fix numpy version * Fix build.sh script for using corect PREFIX
1 parent 2c5de9f commit 6d005b2

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

.github/workflows/conda-package.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
python: [3.8]
15+
python: [3.8, 3.9]
1616
steps:
1717
- uses: actions/checkout@v2
1818
with:
@@ -57,7 +57,7 @@ jobs:
5757

5858
strategy:
5959
matrix:
60-
python: [3.8]
60+
python: [3.8, 3.9]
6161
env:
6262
conda-bld: C:\Miniconda\conda-bld\win-64\
6363
steps:
@@ -96,7 +96,7 @@ jobs:
9696

9797
strategy:
9898
matrix:
99-
python: [3.8]
99+
python: [3.8, 3.9]
100100
experimental: [false]
101101
runner: [ubuntu-latest]
102102
# include:
@@ -160,7 +160,7 @@ jobs:
160160

161161
strategy:
162162
matrix:
163-
python: [3.8]
163+
python: [3.8, 3.9]
164164
experimental: [false]
165165
runner: [windows-latest]
166166
continue-on-error: ${{ matrix.experimental }}
@@ -216,7 +216,7 @@ jobs:
216216
runs-on: ubuntu-latest
217217
strategy:
218218
matrix:
219-
python: [3.8]
219+
python: [3.8, 3.9]
220220
steps:
221221
- name: Download artifact
222222
uses: actions/download-artifact@v2
@@ -241,7 +241,7 @@ jobs:
241241
runs-on: windows-latest
242242
strategy:
243243
matrix:
244-
python: [3.8]
244+
python: [3.8, 3.9]
245245
steps:
246246
- name: Download artifact
247247
uses: actions/download-artifact@v2

conda-recipe/build.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
# Workaround to Klocwork overwriting LD_LIBRARY_PATH that was modified
44
# by DPC++ compiler conda packages. Will need to be added to DPC++ compiler
55
# activation scripts.
6-
export LDFLAGS="$LDFLAGS -Wl,-rpath,$CONDA_PREFIX/lib"
6+
export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
77

88
${PYTHON} setup.py clean --all
9-
INSTALL_CMD="install --sycl-compiler-prefix=$CONDA_PREFIX"
9+
INSTALL_CMD="install --sycl-compiler-prefix=$BUILD_PREFIX"
10+
11+
# Workaround for:
12+
# DPC++ launched by cmake does not see components of `dpcpp_cpp_rt`,
13+
# because conda build isolates LD_LIBRARY_PATH to only $PREFIX subfolders.
14+
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$BUILD_PREFIX/lib
1015

1116
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
1217
# Install packages and assemble wheel package from built bits

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ requirements:
2222
- python
2323
- make # [unix]
2424
- ninja # [win]
25-
- numpy >=1.17 # [win or osx or py==38]
25+
- numpy >=1.17 # [win or osx or py>=38]
2626
- numpy 1.17 # [linux and py==37]
2727
- wheel
2828
run:

0 commit comments

Comments
 (0)