Merge branch 'master' into in-place-element-wise-func-casting

Author: antonwolfy

.github/workflows/conda-package.yml

@@ -13,7 +13,7 @@ env:
   # Follow oneAPI installation instruction for conda, since intel channel is not longer available
   # CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
   CHANNELS: '-c dppy/label/dev -c https://software.repos.intel.com/python/conda/ -c conda-forge --override-channels'
-  CONDA_BUILD_VERSION: '24.9.0'
+  CONDA_BUILD_VERSION: '24.11.2'
   CONDA_INDEX_VERSION: '0.5.0'
   RERUN_TESTS_ON_FAILURE: 'true'
   RUN_TESTS_MAX_ATTEMPTS: 2

.github/workflows/openssf-scorecard.yml

@@ -68,6 +68,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: results.sarif

.pre-commit-config.yaml

@@ -34,7 +34,8 @@ repos:
             (?x)^(
                 dpnp/tests/test_arraycreation.py|
                 dpnp/tests/test_sycl_queue.py|
-                dpnp/tests/test_usm_type.py
+                dpnp/tests/test_usm_type.py|
+                dpnp/tests/third_party/cupy/core_tests/test_nep50_examples.py
             )$
     -   id: python-no-log-warn
     -   id: python-use-type-annotations

CHANGELOG.md

@@ -13,6 +13,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 
+## [0.16.1] - 12/06/2024
+
+This is a bug-fix release.
+
+### Changed
+
+* Changed to use `Miniforge` installer in GitHub actions [#2057](https://github.com/IntelPython/dpnp/pull/2057)
+* Updated `README.md` to reflect current installation requirements and available options [#2166](https://github.com/IntelPython/dpnp/pull/2166)
+* Corrected the list of owners and code maintainers [#2185](https://github.com/IntelPython/dpnp/pull/2185)
+* Bumped the version of `oneMKL` interface used in dpnp build by default to align it with `2025.0` oneAPI release [#2193](https://github.com/IntelPython/dpnp/pull/2193)
+
+### Fixed
+
+* Resolved an issue with Compute Follows Data inconsistency in `dpnp.extract` function [#2172](https://github.com/IntelPython/dpnp/pull/2172)
+* Resolved an import error when using `dpnp` in virtual environment on Linux [#2199](https://github.com/IntelPython/dpnp/pull/2199)
+* Fixed incorrect result produced by `dpnp.fft.fft` function when input array has negative strides [#2202](https://github.com/IntelPython/dpnp/pull/2202)
+* Fixed an issue with `numpy.ndarray` input processing in the `dpnp.from_dlpack` function and updated the documentation [#2209](https://github.com/IntelPython/dpnp/pull/2209)
+* Resolved a compilation error when building with DPC++ 2025.1 compiler [#2211](https://github.com/IntelPython/dpnp/pull/2211)
+
+
 ## [0.16.0] - 10/14/2024
 
 This release reaches an important milestone by making offloading fully asynchronous. Calls to `dpnp` submit tasks for execution to DPC++ runtime and return without waiting for execution of these tasks to finish. The sequential semantics a user comes to expect from execution of Python script is preserved though.

CMakeLists.txt

@@ -6,8 +6,9 @@ project(dpnp
   DESCRIPTION "NumPy-like API accelerated by SYCL."
 )
 
-option(DPNP_GENERATE_COVERAGE "Enable build DPNP with coverage instrumentation" FALSE)
-option(DPNP_BACKEND_TESTS "Enable building of DPNP backend test suite" FALSE)
+option(DPNP_GENERATE_COVERAGE "Enable build DPNP with coverage instrumentation" OFF)
+option(DPNP_BACKEND_TESTS "Enable building of DPNP backend test suite" OFF)
+option(DPNP_WITH_REDIST "Build DPNP assuming DPC++ redistributable is installed into Python prefix" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -111,8 +112,8 @@ if(_use_onemkl_interfaces)
         set(ENABLE_CUSOLVER_BACKEND True)
         set(ENABLE_CUFFT_BACKEND True)
         # set(ENABLE_CURAND_BACKEND True)
-        set(ENABLE_MKLGPU_BACKEND False)
-        set(ENABLE_MKLCPU_BACKEND False)
+        set(ENABLE_MKLGPU_BACKEND True)
+        set(ENABLE_MKLCPU_BACKEND True)
     endif()
 
     if(DPNP_ONEMKL_INTERFACES_DIR)

conda-recipe/bld.bat

@@ -16,7 +16,7 @@ if DEFINED OVERRIDE_INTEL_IPO (
    set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=FALSE"
 )
 
-FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16 17.0.0 17) DO @(
+FOR %%V IN (17.0.0 17 18.0.0 18 19.0.0 19) DO @(
   REM set DIR_HINT if directory exists
   IF EXIST "%BUILD_PREFIX%\Library\lib\clang\%%V\" (
     SET "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\%%V"

conda-recipe/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This is necessary to help DPC++ find Intel libraries such as SVML, IRNG, etc in build prefix
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BUILD_PREFIX}/lib"
+export LIBRARY_PATH="$LIBRARY_PATH:${BUILD_PREFIX}/lib"
 
 # Intel LLVM must cooperate with compiler and sysroot from conda
 echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg
@@ -18,6 +18,7 @@ export DPL_ROOT_HINT=$PREFIX
 export MKL_ROOT_HINT=$PREFIX
 SKBUILD_ARGS=(-- "-DCMAKE_C_COMPILER:PATH=icx" "-DCMAKE_CXX_COMPILER:PATH=icpx" "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON")
 SKBUILD_ARGS=("${SKBUILD_ARGS[@]}" "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON")
+SKBUILD_ARGS=("${SKBUILD_ARGS[@]}" "-DDPNP_WITH_REDIST:BOOL=ON")
 
 # Build wheel package
 WHEELS_BUILD_ARGS=("-p" "manylinux_2_28_x86_64")

doc/conf.py

@@ -220,6 +220,7 @@ def _can_document_member(member, *args, **kwargs):
     "python": ("https://docs.python.org/3/", None),
     "numpy": ("https://docs.scipy.org/doc/numpy/", None),
     "scipy": ("https://docs.scipy.org/doc/scipy/reference/", None),
+    "dpctl": ("https://intelpython.github.io/dpctl/latest/", None),
 }
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.

dpnp/CMakeLists.txt

@@ -1,6 +1,5 @@
 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}")
 
@@ -41,15 +40,19 @@ function(build_dpnp_cython_ext _trgt _src _dest)
            VERBATIM COMMENT "Copying Cython-generated source for target ${_trgt} to dpnp source layout"
        )
   endif()
+
+  set(_rpath_value "$ORIGIN/..")
+  if (DPNP_WITH_REDIST)
+    set(_rpath_value "${_rpath_value}:$ORIGIN/../../../../")
+  endif()
+  set_target_properties(${_trgt} PROPERTIES INSTALL_RPATH ${_rpath_value})
+
   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} PRIVATE dpnp_backend_library)
-  if (UNIX)
-    set_target_properties(${_trgt} PROPERTIES INSTALL_RPATH "$ORIGIN/..")
-  endif()
 endfunction()
 
 add_subdirectory(backend)

dpnp/__init__.py

@@ -49,6 +49,9 @@
         [os.getenv("PATH", ""), mypath, dpctlpath]
     )
 
+# Borrowed from DPCTL
+from dpctl.tensor import DLDeviceType
+
 from dpnp.dpnp_array import dpnp_array as ndarray
 from dpnp.dpnp_flatiter import flatiter as flatiter
 from dpnp.dpnp_iface_types import *