Merge branch 'master' into gold/2021

Author: Alexander-Makaryev

.github/workflows/build-sphinx.yml

@@ -45,7 +45,8 @@ jobs:
         uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: dpnp
-          python-version: 3.7
+          python-version: 3.8
+          channels: intel,conda-forge
           auto-activate-base: false
       - name: Conda info
         shell: bash -l {0}
@@ -55,22 +56,26 @@ jobs:
       - name: Install sphinx dependencies
         shell: bash -l {0}
         run: |
-          conda install numpy cython sphinx sphinx_rtd_theme wheel
+          conda install sphinx sphinx_rtd_theme
+      - name: Install dpnp dependencies
+        shell: bash -l {0}
+        run: |
+          conda install dpctl mkl-devel-dpcpp tbb-devel dpcpp_linux-64 cmake=3.19 cython pytest \
+                        -c dppy/label/dev -c intel -c conda-forge
       - name: Install cuPy dependencies
         shell: bash -l {0}
         run: |
           conda install -c conda-forge cupy cudatoolkit=10.0
       - name: Build library
         shell: bash -l {0}
         run: |
-          . /opt/intel/oneapi/setvars.sh
-          . ./scripts/install_cmake_lin.sh
-          ./0.build.sh
+          python setup.py build_clib
+          CC=dpcpp python setup.py build_ext --inplace
+          python setup.py develop
       - name: Build docs
         shell: bash -l {0}
         run: |
-          . /opt/intel/oneapi/setvars.sh
-          ./0.builddoc.sh
+          make html
         working-directory: doc
       # https://github.com/marketplace/actions/doxygen-action
       - name: Build backend docs

.github/workflows/pre-commit.yml

@@ -0,0 +1,14 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - uses: pre-commit/action@v2.0.0

.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/PyCQA/bandit
+    rev: '1.7.0'
+    hooks:
+    -   id: bandit
+        pass_filenames: false
+        args: ["-r", "dpnp", "-lll"]

1.build.bat

@@ -1,8 +1,8 @@
 
-CALL "1.env.bat"
+:: CALL "1.env.bat"
 
 python setup.py clean
-python setup.py build_clib
+python setup.py build_clib_setuptools
 
 :: inplace build
 python setup.py build_ext --inplace

README.md

@@ -29,7 +29,7 @@ cd dpnp
 ## Install Wheel Package from Pypi
 Install DPNP
 ```cmd
-python -m pip install --index-url https://pypi.anaconda.org/intel/simple -extra-index-url https://pypi.org/simple dpnp
+python -m pip install --index-url https://pypi.anaconda.org/intel/simple --extra-index-url https://pypi.org/simple dpnp
 ```
 Note: DPNP wheel package is placed on Pypi, but some of its dependencies (like Intel numpy) are in Anaconda Cloud.
 That is why install command requires additional intel Pypi channel from Anaconda Cloud.

conda-recipe/bld.bat

@@ -0,0 +1,10 @@
+REM A workaround for activate-dpcpp.bat issue to be addressed in 2021.4
+SET "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
+
+IF DEFINED DPLROOT (
+    ECHO "Sourcing DPLROOT"
+    SET "INCLUDE=%DPLROOT%\include;%INCLUDE%"
+)
+
+%PYTHON% setup.py build_clib
+%PYTHON% setup.py build_ext install

conda-recipe/meta.yaml

@@ -8,21 +8,21 @@ requirements:
     host:
       - python
       - setuptools
-      - numpy 1.19.5
+      - numpy 1.19
       - cython
       - cmake 3.19
       - dpctl >=0.10
-      - mkl-devel-dpcpp
+      - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2021.1.1') }}
       - tbb-devel
       - wheel
     build:
       - {{ compiler('dpcpp') }}
+      - dpcpp-cpp-rt {{ environ.get('DPCPP_VER', '>=2021.1.1') }}
     run:
       - python
       - dpctl >=0.10
-      - dpcpp_cpp_rt >=2021.1.1
-      - mkl >=2021.1.1
-      - mkl-dpcpp >=2021.1.1
+      - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x.x') }}
+      - {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x.x') }}
       - numpy >=1.15
 
 build:
@@ -46,7 +46,6 @@ test:
         - setup.cfg
     commands:
       - python -c "import dpnp"
-      - conda list
       - pytest -s
 
 about:

dpnp/__init__.py

@@ -40,6 +40,16 @@
 if "numpy" in sys.modules:
     warnings.warn("\nDPNP: Module NumPy found. Please load DPNP module before NumPy.\n")
 
+
+import os
+mypath = os.path.dirname(os.path.realpath(__file__))
+
+import dpctl
+dpctlpath = os.path.dirname(dpctl.__file__)
+
+os.environ["PATH"] += os.pathsep + mypath + os.pathsep + dpctlpath
+
+
 # from dpnp.dparray import dparray as ndarray
 from dpnp.dpnp_array import dpnp_array as ndarray
 from dpnp.dpnp_flatiter import flatiter as flatiter

dpnp/backend/CMakeLists.txt

@@ -230,10 +230,10 @@ elseif(WIN32)
 # -DMKL_ILP64 -I"%MKLROOT%\include"
 # mkl_sycl_dll.lib mkl_intel_ilp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib sycl.lib OpenCL.lib
   set(DPNP_MATHLIB_DEP_LIBS
-      mkl_sycl        # _dll
-      mkl_intel_ilp64 # _dll
-      mkl_sequential  # _dll
-      mkl_core        # _dll
+      mkl_sycl_dll
+      mkl_intel_ilp64_dll
+      mkl_tbb_thread_dll # mkl_sequential_dll
+      mkl_core_dll
       sycl
       OpenCL
       CACHE STRING "Set of libraries to link")
@@ -243,11 +243,9 @@ endif()
 
 target_link_libraries(dpnp_backend_c PUBLIC ${DPNP_MATHLIB_DEP_LIBS})
 
-# Parallel STL from DPC++
-if(NOT WIN32)
-  find_package(DPL REQUIRED)
-  target_include_directories(dpnp_backend_c PUBLIC ${DPL_INCLUDE_DIR})
-endif()
+# Parallel STL
+find_package(DPL REQUIRED)
+target_include_directories(dpnp_backend_c PUBLIC ${DPL_INCLUDE_DIR})
 
 # SYCL queue manager
 if(DPNP_SYCL_QUEUE_MGR_ENABLE)

dpnp/backend/examples/example10.cpp

@@ -77,7 +77,7 @@ void test_mkl_random_normal(
     double dev_time_used = 0.0;
     double sum_dev_time_used = 0.0;
 
-    cl::sycl::queue queue{cl::sycl::gpu_selector()};
+    sycl::queue queue{sycl::gpu_selector()};
 
     double* result = reinterpret_cast<double*>(malloc_shared(size * sizeof(double), queue));
     if (result == nullptr)