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 [public CI] #982

Merged
merged 6 commits into from
Oct 1, 2021
Merged

Use Python 3.9 [public CI] #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36f2449
Use Python 3.9 in conda-package.yml
PokhodenkoSA Sep 29, 2021
9112eac
Update conda recipe
PokhodenkoSA Sep 29, 2021
6a177a4
Use oneAPI 2021.3
PokhodenkoSA Sep 30, 2021
68f224f
Fix versions
PokhodenkoSA Sep 30, 2021
1194c42
Fix versions
PokhodenkoSA Sep 30, 2021
a98ebea
Merge branch 'spokhode/fix/oneapi' 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
22 changes: 16 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 @@ -8,6 +8,11 @@ env:
jobs:
build:
runs-on: ubuntu-20.04

strategy:
matrix:
python: [3.8, 3.9]

steps:
- name: Install Intel repository
run: |
Expand All @@ -24,9 +29,9 @@ jobs:
sudo apt install --reinstall -y gcc-9 g++-9 libstdc++-9-dev
- name: Install Intel OneAPI
run: |
sudo apt-get install intel-oneapi-mkl \
intel-oneapi-mkl-devel \
intel-oneapi-dpcpp-cpp-compiler
sudo apt-get install intel-oneapi-mkl=2021.3.0-520 \
intel-oneapi-mkl-devel=2021.3.0-520 \
intel-oneapi-compiler-dpcpp-cpp=2021.3.0-3350
- name: Checkout repo
uses: actions/checkout@v2
with:
Expand All @@ -41,7 +46,7 @@ jobs:
. /opt/intel/oneapi/setvars.sh
. ./scripts/install_cmake_lin.sh
CHANNELS="-c dppy/label/dev -c intel -c defaults --override-channels"
VERSIONS="--python 3.8"
VERSIONS="--python ${{ matrix.python }}"
TEST="--no-test"
conda build \
$TEST \
Expand All @@ -52,18 +57,23 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: dpnp ${{ runner.os }}
name: dpnp ${{ runner.os }} ${{ matrix.python }}
path: /usr/share/miniconda/conda-bld/linux-64/dpnp-*.tar.bz2

upload:
needs: build
if: ${{ github.ref == 'refs/heads/master' }}
runs-on: ubuntu-latest

strategy:
matrix:
python: [3.8, 3.9]

steps:
- name: Download artifact
uses: actions/download-artifact@v2
with:
name: dpnp ${{ runner.os }}
name: dpnp ${{ runner.os }} ${{ matrix.python }}

- name: Install anaconda-client
run: conda install anaconda-client
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 @@ -8,7 +8,7 @@ requirements:
host:
- python
- setuptools
- numpy >=1.15 # [win or osx or py==38]
- numpy >=1.15 # [win or osx or py>=38]
- numpy 1.17 # [linux and py==37]
- cython
- cmake >=3.16.5
Expand Down