Merge origin into tests_cuda

Author: vlad-perevezentsev

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)

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")

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/backend/CMakeLists.txt

@@ -100,6 +100,10 @@ add_library(dpnp_backend_library INTERFACE IMPORTED GLOBAL)
 target_include_directories(dpnp_backend_library BEFORE INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src)
 target_link_libraries(dpnp_backend_library INTERFACE ${_trgt})
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../")
+endif()
+
 if (DPNP_BACKEND_TESTS)
   add_subdirectory(tests)
 endif()

dpnp/backend/extensions/blas/CMakeLists.txt

@@ -93,6 +93,10 @@ else()
     target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::BLAS)
 endif()
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../../../../")
+endif()
+
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/blas"
 )

dpnp/backend/extensions/fft/CMakeLists.txt

@@ -89,6 +89,10 @@ else()
     target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::DFT)
 endif()
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../../../../")
+endif()
+
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/fft"
 )

dpnp/backend/extensions/lapack/CMakeLists.txt

@@ -107,6 +107,10 @@ else()
     target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::LAPACK)
 endif()
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../../../../")
+endif()
+
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/lapack"
 )

dpnp/backend/extensions/statistics/CMakeLists.txt

@@ -84,6 +84,10 @@ if (DPNP_GENERATE_COVERAGE)
     target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
 endif()
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../../../../")
+endif()
+
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/statistics"
 )

dpnp/backend/extensions/ufunc/CMakeLists.txt

@@ -103,6 +103,10 @@ if (DPNP_GENERATE_COVERAGE)
     target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
 endif()
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../../../../")
+endif()
+
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/ufunc"
 )

dpnp/backend/extensions/vm/CMakeLists.txt

@@ -120,6 +120,10 @@ else()
     target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::VM)
 endif()
 
+if (DPNP_WITH_REDIST)
+    set_target_properties(${python_module_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../../../../../../")
+endif()
+
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/vm"
 )

dpnp/backend/kernels/dpnp_krnl_common.cpp

@@ -35,11 +35,23 @@
 #include "queue_sycl.hpp"
 #include <dpnp_iface.hpp>
 
+/**
+ * Version of SYCL DPC++ 2025.1 compiler where support of
+ * sycl::ext::oneapi::experimental::properties was added.
+ */
+#ifndef __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT
+#define __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT 20241129
+#endif
+
 namespace mkl_blas = oneapi::mkl::blas;
 namespace mkl_blas_cm = oneapi::mkl::blas::column_major;
 namespace mkl_blas_rm = oneapi::mkl::blas::row_major;
 namespace mkl_lapack = oneapi::mkl::lapack;
 
+#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT
+namespace syclex = sycl::ext::oneapi::experimental;
+#endif
+
 template <typename _KernelNameSpecialization1,
           typename _KernelNameSpecialization2,
           typename _KernelNameSpecialization3>
@@ -78,8 +90,13 @@ sycl::event dot(sycl::queue &queue,
             cgh.parallel_for(
                 sycl::range<1>{size},
                 sycl::reduction(
-                    result_out, std::plus<_DataType_output>(),
-                    sycl::property::reduction::initialize_to_identity{}),
+                    result_out, sycl::plus<_DataType_output>(),
+#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_REDUCTION_PROPERTIES_SUPPORT
+                    syclex::properties(syclex::initialize_to_identity)
+#else
+                    sycl::property::reduction::initialize_to_identity {}
+#endif
+                        ),
                 [=](sycl::id<1> idx, auto &sum) {
                     sum += static_cast<_DataType_output>(
                                input1_in[idx * input1_strides]) *

dpnp/dpnp_array.py

@@ -434,7 +434,11 @@ def __isub__(self, other):
         dpnp.subtract(self, other, out=self)
         return self
 
-    # '__iter__',
+    def __iter__(self):
+        """Return ``iter(self)``."""
+        if self.ndim == 0:
+            raise TypeError("iteration over a 0-d array")
+        return (self[i] for i in range(self.shape[0]))
 
     def __itruediv__(self, other):
         """Return ``self/=value``."""

dpnp/dpnp_iface_indexing.py

@@ -69,6 +69,7 @@
     "fill_diagonal",
     "flatnonzero",
     "indices",
+    "iterable",
     "ix_",
     "mask_indices",
     "ndindex",
@@ -1039,6 +1040,47 @@ def indices(
     return res
 
 
+def iterable(y):
+    """
+    Check whether or not an object can be iterated over.
+
+    For full documentation refer to :obj:`numpy.iterable`.
+
+    Parameters
+    ----------
+    y : object
+        Input object.
+
+    Returns
+    -------
+    out : bool
+        Return ``True`` if the object has an iterator method or is a sequence
+        and ``False`` otherwise.
+
+    Examples
+    --------
+    >>> import dpnp as np
+    >>> np.iterable([1, 2, 3])
+    True
+    >>> np.iterable(2)
+    False
+
+    In most cases, the results of ``np.iterable(obj)`` are consistent with
+    ``isinstance(obj, collections.abc.Iterable)``. One notable exception is
+    the treatment of 0-dimensional arrays:
+
+    >>> from collections.abc import Iterable
+    >>> a = np.array(1.0)  # 0-dimensional array
+    >>> isinstance(a, Iterable)
+    True
+    >>> np.iterable(a)
+    False
+
+    """
+
+    return numpy.iterable(y)
+
+
 def ix_(*args):
     """Construct an open mesh from multiple sequences.
 

dpnp/tests/test_indexing.py

@@ -337,6 +337,14 @@ def test_ix_error(self, xp, shape):
         assert_raises(ValueError, xp.ix_, xp.ones(shape))
 
 
+class TestIterable:
+    @pytest.mark.parametrize("data", [[1.0], [2, 3]])
+    def test_basic(self, data):
+        a = numpy.array(data)
+        ia = dpnp.array(a)
+        assert dpnp.iterable(ia) == numpy.iterable(a)
+
+
 @pytest.mark.parametrize(
     "shape", [[1, 2, 3], [(1, 2, 3)], [(3,)], [3], [], [()], [0]]
 )

dpnp/tests/third_party/cupy/core_tests/test_iter.py

@@ -0,0 +1,44 @@
+import unittest
+
+import numpy
+import pytest
+
+import dpnp as cupy
+from dpnp.tests.third_party.cupy import testing
+
+
+@testing.parameterize(
+    *testing.product(
+        {"shape": [(3,), (2, 3, 4), (0,), (0, 2), (3, 0)]},
+    )
+)
+class TestIter(unittest.TestCase):
+
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_array_equal()
+    def test_list(self, xp, dtype):
+        x = testing.shaped_arange(self.shape, xp, dtype)
+        return list(x)
+
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_equal()
+    def test_len(self, xp, dtype):
+        x = testing.shaped_arange(self.shape, xp, dtype)
+        return len(x)
+
+
+class TestIterInvalid(unittest.TestCase):
+
+    @testing.for_all_dtypes()
+    def test_iter(self, dtype):
+        for xp in (numpy, cupy):
+            x = testing.shaped_arange((), xp, dtype)
+            with pytest.raises(TypeError):
+                iter(x)
+
+    @testing.for_all_dtypes()
+    def test_len(self, dtype):
+        for xp in (numpy, cupy):
+            x = testing.shaped_arange((), xp, dtype)
+            with pytest.raises(TypeError):
+                len(x)

dpnp/tests/third_party/cupy/creation_tests/test_ranges.py

@@ -172,7 +172,7 @@ def test_linspace_float_overflow(self, xp):
         dtype = cupy.default_float_type()
         return xp.linspace(0.0, xp.finfo(dtype).max / 5, 10, dtype=dtype)
 
-    @testing.numpy_cupy_allclose()
+    @testing.numpy_cupy_allclose(rtol={numpy.float32: 1e-6, "default": 1e-7})
     def test_linspace_float_underflow(self, xp):
         # find minimum subnormal number
         dtype = cupy.default_float_type()