Skip to content

Commit 6dfc6db

Browse files
authored
dpctl use from oneapi for conda-build (#695)
* dpctl use from oneapi for conda-build
1 parent 649ead9 commit 6dfc6db

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

scripts/azure-pipelines.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- bash: |
1212
echo ========================= Conda ENV ====================================
1313
conda create -q -y -n CondaCodeStyle python=3.8 conda-build conda-verify \
14-
numpy=1.19 cython pytest \
14+
numpy=1.20.1 cython pytest \
1515
pycodestyle autopep8 black
1616
. /usr/share/miniconda/etc/profile.d/conda.sh
1717
conda activate CondaCodeStyle
@@ -55,7 +55,7 @@ jobs:
5555
- bash: |
5656
echo ========================= Conda ENV =================================
5757
conda create -q -y -n CondaCodeCov python=3.8 conda-build conda-verify \
58-
numpy=1.19 cython pytest \
58+
numpy=1.20.1 cython pytest \
5959
pycodestyle autopep8 \
6060
cython pytest pytest-cov
6161
. /usr/share/miniconda/etc/profile.d/conda.sh
@@ -116,15 +116,18 @@ jobs:
116116
versionSpec: '$(python.version)'
117117
displayName: 'Use Python $(python.version)'
118118
- bash: |
119+
echo ========================= install OneAPI =================================
120+
./scripts/install_system_deps.sh
121+
119122
echo ========================= Conda ENV ======================================
120-
conda create -q -y -n dpnp$(python.version) python=$(python.version) numpy=1.19
123+
conda create -q -y -n dpnp$(python.version) python=$(python.version) numpy=1.19 conda-build cython pytest hypothesis
121124
. /usr/share/miniconda/etc/profile.d/conda.sh
122125
conda activate dpnp$(python.version)
123-
echo ========================= CI ENV =========================================
124-
. ./scripts/set_ci_env.sh
126+
125127
echo ========================= build DPNP =====================================
126128
./0.build.sh
127129
echo ========================= run tests ======================================
130+
. ./0.env.sh
128131
python -m tests_external.numpy.runtests
129132
130133
# test python ./setup.py bdist_wheel command with no dpctl
@@ -172,7 +175,7 @@ jobs:
172175
173176
- script: |
174177
call activate
175-
conda install -y conda-build numpy=1.19 cython pytest hypothesis
178+
conda install -y conda-build numpy=1.20.1 cython pytest hypothesis
176179
displayName: Install extra conda packages
177180
178181
- script: |
@@ -292,7 +295,7 @@ jobs:
292295
. /opt/intel/oneapi/setvars.sh
293296
294297
./scripts/install_python_deps.sh
295-
./scripts/build_deps_dpctl.sh
298+
# ./scripts/build_deps_dpctl.sh
296299
297300
conda list
298301
echo ========================= make DPNP package =========================

scripts/install_python_deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ echo +++++++++++++++++++++++++ Python prerequisites ++++++++++++++++++++++++++++
77
echo ========================= Conda: install prerequisites =========================
88
# explicitly install mkl blas instead of openblas
99
# because numpy is installed with openblas for Python 3.9 by default
10-
conda install -y conda-build numpy=1.19 blas=*=mkl cython pytest hypothesis
10+
conda install -y conda-build numpy=1.20.1 blas=*=mkl cython pytest hypothesis
1111

1212
echo ========================= Conda: remove mkl ====================================
1313
conda remove mkl --force -y || true

0 commit comments

Comments
 (0)