Merge branch 'master' into gold/2021

Author: antonwolfy

.github/workflows/build-sphinx.yml

@@ -71,8 +71,8 @@ jobs:
 
       - name: Install dpnp dependencies
         run: |
-          conda install dpctl mkl-devel-dpcpp tbb-devel dpcpp_linux-64 cmake cython pytest \
-                        -c dppy/label/dev -c intel -c conda-forge
+          conda install dpctl mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
+              cmake cython pytest -c dppy/label/dev -c intel -c conda-forge
 
       - name: Install cuPy dependencies
         run: conda install -c conda-forge cupy cudatoolkit=10.0
@@ -84,7 +84,7 @@ jobs:
 
       - name: Build library
         run: |
-          DPLROOT=/opt/intel/oneapi/dpl/latest python setup.py build_clib
+          python setup.py build_clib
           CC=dpcpp python setup.py build_ext --inplace
           python setup.py develop
 

.github/workflows/conda-package.yml

@@ -40,13 +40,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Checkout oneDPL
-        uses: actions/[email protected]
-        with:
-          repository: oneapi-src/oneDPL
-          path: oneDPL
-          ref: oneDPL-2021.7.0-release
-
       - name: Setup miniconda
         uses: conda-incubator/[email protected]
         with:
@@ -76,8 +69,6 @@ jobs:
 
       - name: Build conda package
         run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
-        env:
-          DPLROOT: '${{ github.workspace }}/oneDPL'
 
       - name: Upload artifact
         uses: actions/[email protected]
@@ -110,13 +101,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Checkout oneDPL
-        uses: actions/[email protected]
-        with:
-          repository: oneapi-src/oneDPL
-          path: oneDPL
-          ref: oneDPL-2021.7.0-release
-
       - name: Setup miniconda
         uses: conda-incubator/[email protected]
         with:
@@ -148,8 +132,6 @@ jobs:
 
       - name: Build conda package
         run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
-        env:
-          DPLROOT: '%GITHUB_WORKSPACE%\oneDPL'
 
       - name: Upload artifact
         uses: actions/[email protected]

0.build.sh

@@ -7,7 +7,7 @@ cd ${THEDIR}
 export DPNP_DEBUG=1
 
 python setup.py clean
-DPLROOT=/opt/intel/oneapi/dpl/latest python setup.py build_clib
+python setup.py build_clib
 
 # inplace build
 CC=dpcpp python setup.py build_ext --inplace

conda-recipe/meta.yaml

@@ -13,6 +13,7 @@ requirements:
       - cmake >=3.19
       - dpctl >=0.13
       - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2021.1.1') }}
+      - onedpl-devel
       - tbb-devel
       - wheel
     build: