Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Python 3.9 [in public CI] #599

Merged
merged 7 commits into from
Sep 30, 2021
Merged

Use Python 3.9 [in public CI] #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18fa029
Use Python 3.9 in CI
PokhodenkoSA Sep 28, 2021
763fcbd
Fix numpy version
PokhodenkoSA Sep 28, 2021
d1ffeb6
Remove intel channel
PokhodenkoSA Sep 28, 2021
b545096
Revert "Remove intel channel"
PokhodenkoSA Sep 29, 2021
8cba97c
Use `dpcpp_cpp_rt` in host requirements
PokhodenkoSA Sep 29, 2021
6a28593
Fix build.sh script for using corect PREFIX
PokhodenkoSA Sep 30, 2021
8e92c82
Merge branch 'master' into spokhode/enh/py39
PokhodenkoSA Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/conda-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
python: [3.8]
python: [3.8, 3.9]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

strategy:
matrix:
python: [3.8]
python: [3.8, 3.9]
experimental: [false]
runner: [ubuntu-latest]
# include:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 7 additions & 2 deletions conda-recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down