Merge pull request #1619 from IntelPython/merge_master_into_gold

Merge master into gold

Author: oleksandr-pavlyk

.github/workflows/build-sphinx.yml

@@ -91,7 +91,7 @@ jobs:
 
       - name: Install dpnp dependencies
         run: |
-          conda install numpy"<1.24" dpctl mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
+          conda install numpy"<1.24" dpctl">=0.15.1dev1" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
               cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }}
 
       - name: Install cuPy dependencies

.github/workflows/conda-package.yml

@@ -27,18 +27,25 @@ env:
       test_sycl_queue.py
       test_umath.py
       test_usm_type.py
-      third_party/cupy/core_tests/test_ndarray_complex_ops.py
+      third_party/cupy/core_tests
       third_party/cupy/linalg_tests/test_product.py
       third_party/cupy/logic_tests/test_comparison.py
       third_party/cupy/logic_tests/test_truth.py
       third_party/cupy/manipulation_tests/test_basic.py
+      third_party/cupy/manipulation_tests/test_dims.py
       third_party/cupy/manipulation_tests/test_join.py
       third_party/cupy/manipulation_tests/test_rearrange.py
       third_party/cupy/manipulation_tests/test_transpose.py
+      third_party/cupy/math_tests/test_arithmetic.py
       third_party/cupy/math_tests/test_explog.py
+      third_party/cupy/math_tests/test_floating.py
+      third_party/cupy/math_tests/test_hyperbolic.py
+      third_party/cupy/math_tests/test_matmul.py
       third_party/cupy/math_tests/test_misc.py
+      third_party/cupy/math_tests/test_rounding.py
       third_party/cupy/math_tests/test_trigonometric.py
       third_party/cupy/sorting_tests/test_sort.py
+      third_party/cupy/sorting_tests/test_count.py
   VER_JSON_NAME: 'version.json'
   VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
   VER_SCRIPT2: "d = j['dpnp'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
@@ -395,3 +402,33 @@ jobs:
         run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
         env:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+
+  cleanup_packages:
+    name: Clean up anaconda packages
+    needs: [upload]
+    runs-on: 'ubuntu-latest'
+    defaults:
+      run:
+        shell: bash -el {0}
+    steps:
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          run-post: false
+          channel-priority: "disabled"
+          channels: conda-forge
+          python-version: '3.11'
+
+      - name: Install anaconda-client
+        run: conda install anaconda-client
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          repository: IntelPython/devops-tools
+          fetch-depth: 0
+
+      - name: Cleanup old packages
+        run: |
+          python scripts/cleanup-old-packages.py \
+          --verbose --force --token ${{ secrets.ANACONDA_TOKEN }} \
+          --package dppy/${{ env.PACKAGE_NAME }} --label dev

.github/workflows/generate_coverage.yaml

@@ -39,26 +39,32 @@ jobs:
       - name: Install Lcov
         run: |
           sudo apt-get install lcov
+
       - name: Install dpnp dependencies
         run: |
           conda install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \
               dpctl dpcpp_linux-64 sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel onedpl-devel ${{ env.CHANNELS }}
+
       - name: Conda info
         run: |
           conda info
           conda list
+
       - name: Build dpnp with coverage
         run: |
           python scripts/gen_coverage.py --pytest-opts="--ignore tests/test_random.py"
+
       - name: Install coverall dependencies
         run: |
           sudo gem install coveralls-lcov
           pip install coveralls==3.2.0
+
       - name: Upload coverage data to coveralls.io
         run: |
           echo "Processing pytest-coverage"
           export DPNP_PYTEST_LCOV=$(find . -name dpnp_pytest.lcov)
           coveralls-lcov -v -n $DPNP_PYTEST_LCOV > pytest-dpnp-c-api-coverage.json
+
           # merge file with coverage data and upload
           echo "Merging files with coverage data"
           coveralls --service=github --merge=pytest-dpnp-c-api-coverage.json

CMakeLists.txt

@@ -1,8 +1,4 @@
-cmake_minimum_required(VERSION 3.21...3.26 FATAL_ERROR)
-
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
-  cmake_policy(SET CMP0135 NEW)
-endif()
+cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR)
 
 project(dpnp
   DESCRIPTION "NumPy-like API accelerated by SYCL."
@@ -27,7 +23,7 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DPCTL_MODULE_PATH})
 
 
-find_package(IntelDPCPP REQUIRED)
+find_package(IntelSYCL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
 find_package(TBB QUIET)
 if(TBB_FOUND)
     find_package(TBB REQUIRED)
@@ -77,7 +73,7 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(pybind11)
 
-find_package(PythonExtensions REQUIRED)
+find_package(Python REQUIRED COMPONENTS Development.Module)
 find_package(NumPy REQUIRED)
 
 set(CYTHON_FLAGS "-t -w \"${CMAKE_SOURCE_DIR}\"")

conda-recipe/meta.yaml

@@ -8,12 +8,12 @@ requirements:
     host:
       - python
       - setuptools
-      - numpy 1.21
+      - numpy
       - cython
       - cmake >=3.21
       - ninja
       - git
-      - dpctl >=0.15.0
+      - dpctl >=0.15.1dev1
       - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2024.0.0') }}
       - onedpl-devel
       - tbb-devel
@@ -25,7 +25,7 @@ requirements:
       - sysroot_linux-64 >=2.28 # [linux]
     run:
       - python
-      - dpctl >=0.15.0
+      - dpctl >=0.15.1dev1
       - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
       - {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }}
       - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}

doc/docstring_template.py

@@ -78,7 +78,7 @@ def func(a, b=None, c=True):
     -----------
     Some limitations in comparison to baseline, ex:
     Input array data types are limited by supported DPNP :ref:`Data types`.
-    Parameter ``c`` is supported only with default value ``True``.
+    Parameter `c` is supported only with default value ``True``.
     Otherwise the function will be executed sequentially on CPU.
 
     See Also

dpnp/CMakeLists.txt

@@ -1,45 +1,53 @@
 
 function(build_dpnp_cython_ext _trgt _src _dest)
+  set(options SYCL)
+  cmake_parse_arguments(BUILD_DPNP_EXT "${options}" "" "" ${ARGN})
   add_cython_target(${_trgt} ${_src} CXX OUTPUT_VAR _generated_src)
   message(STATUS "Using ${_trgt}")
-  add_library(${_trgt} MODULE ${_generated_src})
+
+  Python_add_library(${_trgt} MODULE WITH_SOABI ${_generated_src})
   set(_trgt_deps "${_trgt}_deps")
   add_custom_target(${_trgt_deps} DEPENDS ${_src})
   add_dependencies(${_trgt} ${_trgt_deps})
+
+  if (BUILD_DPNP_EXT_SYCL)
+    add_sycl_to_target(TARGET ${_trgt} SOURCES ${_generated_src})
+  endif()
+
   if (DPNP_GENERATE_COVERAGE)
     target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1)
+    target_compile_options(${_trgt} PRIVATE "-fno-sycl-use-footer")
   endif()
-  target_compile_definitions(${_trgt} PRIVATE NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
+
   # NumPy
+  target_compile_definitions(${_trgt} PRIVATE NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
   target_include_directories(${_trgt} PRIVATE ${NumPy_INCLUDE_DIR})
+
   # Dpctl
   target_include_directories(${_trgt} PRIVATE ${Dpctl_INCLUDE_DIR})
   target_link_directories(${_trgt} PRIVATE ${Dpctl_INCLUDE_DIR}/..)
-  target_link_libraries(${_trgt} DPCTLSyclInterface)
+  target_link_libraries(${_trgt} PRIVATE DPCTLSyclInterface)
 
   set(_linker_options "LINKER:${DPNP_LDFLAGS}")
   target_link_options(${_trgt} PRIVATE ${_linker_options})
-  python_extension_module(${_trgt})
 
   if (DPNP_GENERATE_COVERAGE)
        set(_copy_cxx_trgt "${_trgt}_copy_cxx")
        add_custom_target(
-           ${_copy_cxx_trgt} ALL
-           COMMAND ${CMAKE_COMMAND}
-         -DSOURCE_FILE=${_generated_src}
-         -DDEST=${CMAKE_CURRENT_SOURCE_DIR}
-         -P ${CMAKE_SOURCE_DIR}/dpnp/cmake/copy_existing.cmake
-     DEPENDS ${_trgt}
-     VERBATIM
-           COMMENT "Copying Cython-generated source for target ${_trgt} to dpnp source layout"
+           ${_copy_cxx_trgt} ALL COMMAND ${CMAKE_COMMAND}
+           -DSOURCE_FILE=${_generated_src}
+           -DDEST=${CMAKE_CURRENT_SOURCE_DIR}
+           -P ${CMAKE_SOURCE_DIR}/dpnp/cmake/copy_existing.cmake
+           DEPENDS ${_trgt}
+           VERBATIM COMMENT "Copying Cython-generated source for target ${_trgt} to dpnp source layout"
        )
   endif()
   install(TARGETS ${_trgt} LIBRARY DESTINATION ${_dest})
 endfunction()
 
 function(build_dpnp_cython_ext_with_backend _trgt _src _dest)
   build_dpnp_cython_ext(${_trgt} ${_src} ${_dest})
-  target_link_libraries(${_trgt} dpnp_backend_library)
+  target_link_libraries(${_trgt} PRIVATE dpnp_backend_library)
   if (UNIX)
     set_target_properties(${_trgt} PROPERTIES INSTALL_RPATH "$ORIGIN/..")
   endif()