Merge changes for OOC release 0.10.3

antonwolfy · antonwolfy · commit ac54e3f3a28f · 2022-11-03T00:14:38.000+01:00
Out of cycle release to distribute the fix of #1210 to intel channel on Anaconda. Temporary pin `dpcpp-cpp-rt` on `2022.2.0` version to be able to build DPNP in internal CI.
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -169,7 +169,6 @@ jobs:
     strategy:
       matrix:
         python: ['3.8', '3.9']
-        dpctl: ['0.13.0']
         experimental: [false]
 
     continue-on-error: ${{ matrix.experimental }}
@@ -239,7 +238,7 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
 
       - name: Install dpnp
-        run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} dpctl=${{ matrix.dpctl }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
+        run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
         env:
           TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
 
@@ -270,7 +269,6 @@ jobs:
     strategy:
       matrix:
         python: ['3.8', '3.9']
-        dpctl: ['0.13.0']
         experimental: [false]
 
     continue-on-error: ${{ matrix.experimental }}
@@ -344,7 +342,7 @@ jobs:
           echo PACKAGE_VERSION: %PACKAGE_VERSION%
           (echo PACKAGE_VERSION=%PACKAGE_VERSION%) >> %GITHUB_ENV%
 
-          conda install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% dpctl=${{ matrix.dpctl }} python=${{ matrix.python }} ${{ env.TEST_CHANNELS }} --only-deps --dry-run > lockfile
+          conda install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} ${{ env.TEST_CHANNELS }} --only-deps --dry-run > lockfile
         env:
           TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
 
@@ -369,7 +367,7 @@ jobs:
       - name: Install dpnp
         run: |
           @echo on
-          conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} dpctl=${{ matrix.dpctl }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
+          conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
         env:
           TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
 
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -12,6 +12,7 @@ requirements:
       - cython
       - cmake >=3.19
       - dpctl >=0.13
+      - dpcpp-cpp-rt 2022.2.0
       - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2021.1.1') }}
       - tbb-devel
       - wheel
diff --git a/doc/conf.py b/doc/conf.py
@@ -33,7 +33,7 @@
 # The short X.Y version
 version = '0.10'
 # The full version, including alpha/beta/rc tags
-release = '0.10.2'
+release = '0.10.3'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/dpnp/backend/CMakeLists.txt b/dpnp/backend/CMakeLists.txt
@@ -27,7 +27,7 @@
 
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
-# set(DPNP_VERSION 0.10.2)
+# set(DPNP_VERSION 0.10.3)
 # set(DPNP_API_VERSION 0.10)
 
 # set directory where the custom finders live
diff --git a/dpnp/backend/doc/Doxyfile b/dpnp/backend/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "DPNP C++ backend kernel library"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.10.2
+PROJECT_NUMBER         = 0.10.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/dpnp/backend/include/dpnp_iface_fptr.hpp b/dpnp/backend/include/dpnp_iface_fptr.hpp
@@ -1,5 +1,5 @@
 //*****************************************************************************
-// Copyright (c) 2016-2020, Intel Corporation
+// Copyright (c) 2016-2022, Intel Corporation
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,6 @@ enum class DPNPFuncName : size_t
     DPNP_FN_ANY,                          /**< Used in numpy.any() impl  */
     DPNP_FN_ANY_EXT,                      /**< Used in numpy.any() impl, requires extra parameters */
     DPNP_FN_ARANGE,                       /**< Used in numpy.arange() impl  */
-    DPNP_FN_ARANGE_EXT,                   /**< Used in numpy.arange() impl, requires extra parameters */
     DPNP_FN_ARCCOS,                       /**< Used in numpy.arccos() impl  */
     DPNP_FN_ARCCOS_EXT,                   /**< Used in numpy.arccos() impl, requires extra parameters */
     DPNP_FN_ARCCOSH,                      /**< Used in numpy.arccosh() impl  */
diff --git a/dpnp/backend/kernels/dpnp_krnl_arraycreation.cpp b/dpnp/backend/kernels/dpnp_krnl_arraycreation.cpp
@@ -1,5 +1,5 @@
 //*****************************************************************************
-// Copyright (c) 2016-2020, Intel Corporation
+// Copyright (c) 2016-2022, Intel Corporation
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -90,18 +90,41 @@ void dpnp_arange_c(size_t start, size_t step, void* result1, size_t size)
                                                            size,
                                                            dep_event_vec_ref);
     DPCTLEvent_WaitAndThrow(event_ref);
+    DPCTLEvent_Delete(event_ref);
 }
 
 template <typename _DataType>
 void (*dpnp_arange_default_c)(size_t, size_t, void*, size_t) = dpnp_arange_c<_DataType>;
 
-template <typename _DataType>
-DPCTLSyclEventRef (*dpnp_arange_ext_c)(DPCTLSyclQueueRef,
-                                       size_t,
-                                       size_t,
-                                       void*,
-                                       size_t,
-                                       const DPCTLEventVectorRef) = dpnp_arange_c<_DataType>;
+// Explicit instantiation of the function, since dpnp_arange_c() is used by other template functions,
+// but implicit instantiation is not applied anymore.
+template DPCTLSyclEventRef dpnp_arange_c<int32_t>(DPCTLSyclQueueRef,
+                                                  size_t,
+                                                  size_t,
+                                                  void*,
+                                                  size_t,
+                                                  const DPCTLEventVectorRef);
+
+template DPCTLSyclEventRef dpnp_arange_c<int64_t>(DPCTLSyclQueueRef,
+                                                  size_t,
+                                                  size_t,
+                                                  void*,
+                                                  size_t,
+                                                  const DPCTLEventVectorRef);
+
+template DPCTLSyclEventRef dpnp_arange_c<float>(DPCTLSyclQueueRef,
+                                                size_t,
+                                                size_t,
+                                                void*,
+                                                size_t,
+                                                const DPCTLEventVectorRef);
+
+template DPCTLSyclEventRef dpnp_arange_c<double>(DPCTLSyclQueueRef,
+                                                 size_t,
+                                                 size_t,
+                                                 void*,
+                                                 size_t,
+                                                 const DPCTLEventVectorRef);
 
 template <typename _DataType>
 DPCTLSyclEventRef dpnp_diag_c(DPCTLSyclQueueRef q_ref,
@@ -1287,11 +1310,6 @@ void func_map_init_arraycreation(func_map_t& fmap)
     fmap[DPNPFuncName::DPNP_FN_ARANGE][eft_FLT][eft_FLT] = {eft_FLT, (void*)dpnp_arange_default_c<float>};
     fmap[DPNPFuncName::DPNP_FN_ARANGE][eft_DBL][eft_DBL] = {eft_DBL, (void*)dpnp_arange_default_c<double>};
 
-    fmap[DPNPFuncName::DPNP_FN_ARANGE_EXT][eft_INT][eft_INT] = {eft_INT, (void*)dpnp_arange_ext_c<int32_t>};
-    fmap[DPNPFuncName::DPNP_FN_ARANGE_EXT][eft_LNG][eft_LNG] = {eft_LNG, (void*)dpnp_arange_ext_c<int64_t>};
-    fmap[DPNPFuncName::DPNP_FN_ARANGE_EXT][eft_FLT][eft_FLT] = {eft_FLT, (void*)dpnp_arange_ext_c<float>};
-    fmap[DPNPFuncName::DPNP_FN_ARANGE_EXT][eft_DBL][eft_DBL] = {eft_DBL, (void*)dpnp_arange_ext_c<double>};
-
     fmap[DPNPFuncName::DPNP_FN_DIAG][eft_INT][eft_INT] = {eft_INT, (void*)dpnp_diag_default_c<int32_t>};
     fmap[DPNPFuncName::DPNP_FN_DIAG][eft_LNG][eft_LNG] = {eft_LNG, (void*)dpnp_diag_default_c<int64_t>};
     fmap[DPNPFuncName::DPNP_FN_DIAG][eft_FLT][eft_FLT] = {eft_FLT, (void*)dpnp_diag_default_c<float>};
diff --git a/dpnp/dparray.pyx b/dpnp/dparray.pyx
@@ -1,7 +1,7 @@
 # cython: language_level=3
 # -*- coding: utf-8 -*-
 # *****************************************************************************
-# Copyright (c) 2016-2020, Intel Corporation
+# Copyright (c) 2016-2022, Intel Corporation
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,23 +33,77 @@ using USB interface for an Intel GPU device.
 
 """
 
+import warnings
 
 from libcpp cimport bool as cpp_bool
 
 from dpnp.dpnp_iface_types import *
-from dpnp.dpnp_iface import *
+
+# It's prohibeted to use 'import *' from 'dpnp.dpnp_iface_arraycreation' module here,
+# because module has 'array' function, but cython has already imported 'array' by default.
+# It would cause import collision. Thus instead import each function explicitly.
+from dpnp.dpnp_iface_arraycreation import (
+    arange,
+    array,
+    asanyarray,
+    asarray,
+    ascontiguousarray,
+    copy,
+    diag,
+    diagflat,
+    empty,
+    empty_like,
+    eye,
+    frombuffer,
+    fromfile,
+    fromfunction,
+    fromiter,
+    fromstring,
+    full,
+    full_like,
+    geomspace,
+    identity,
+    linspace,
+    loadtxt,
+    logspace,
+    meshgrid,
+    mgrid,
+    ogrid,
+    ones,
+    ones_like,
+    ptp,
+    trace,
+    tri,
+    tril,
+    triu,
+    vander,
+    zeros,
+    zeros_like
+)
+from dpnp.dpnp_iface_bitwise import *
+from dpnp.dpnp_iface_counting import *
+from dpnp.dpnp_iface_indexing import *
+from dpnp.dpnp_iface_libmath import *
+from dpnp.dpnp_iface_linearalgebra import *
+from dpnp.dpnp_iface_logic import *
+from dpnp.dpnp_iface_manipulation import *
+from dpnp.dpnp_iface_mathematical import *
+from dpnp.dpnp_iface_searching import *
+from dpnp.dpnp_iface_sorting import *
+from dpnp.dpnp_iface_statistics import *
+from dpnp.dpnp_iface_trigonometric import *
 
 # to avoid interference with Python internal functions
 from dpnp.dpnp_iface import sum as iface_sum
 from dpnp.dpnp_iface import prod as iface_prod
 from dpnp.dpnp_iface import get_dpnp_descriptor as iface_get_dpnp_descriptor
 
-from dpnp.dpnp_algo cimport *
 from dpnp.dpnp_iface_statistics import min, max  # TODO do the same as for iface_sum
 from dpnp.dpnp_iface_logic import all, any  # TODO do the same as for iface_sum
 import numpy
 cimport numpy
 
+from dpnp.dpnp_algo cimport *
 cimport dpnp.dpnp_utils as utils
 
 
@@ -124,6 +178,12 @@ cdef class dparray:
 
     """
 
+    with warnings.catch_warnings():
+        warnings.filterwarnings("default", category=DeprecationWarning)
+        warnings.warn("dpnp.dparray class is deprecated, use dpnp.dpnp_array class instead",
+                      DeprecationWarning,
+                      stacklevel=2)
+
     def __init__(self, shape, dtype=float64, memptr=None, strides=None, order=b'C'):
         cdef Py_ssize_t shape_it = 0
         cdef Py_ssize_t strides_it = 0
diff --git a/dpnp/dpnp_algo/dpnp_algo.pxd b/dpnp/dpnp_algo/dpnp_algo.pxd
@@ -45,7 +45,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName":  # need this na
         DPNP_FN_ANY
         DPNP_FN_ANY_EXT
         DPNP_FN_ARANGE
-        DPNP_FN_ARANGE_EXT
         DPNP_FN_ARCCOS
         DPNP_FN_ARCCOS_EXT
         DPNP_FN_ARCCOSH
@@ -519,7 +518,6 @@ cpdef dpnp_descriptor dpnp_matmul(dpnp_descriptor in_array1, dpnp_descriptor in_
 """
 Array creation routines
 """
-cpdef dpnp_descriptor dpnp_arange(start, stop, step, dtype)
 cpdef dpnp_descriptor dpnp_init_val(shape, dtype, value)
 cpdef dpnp_descriptor dpnp_full(result_shape, value_in, result_dtype)  # same as dpnp_init_val
 cpdef dpnp_descriptor dpnp_copy(dpnp_descriptor x1)
diff --git a/dpnp/dpnp_algo/dpnp_algo.pyx b/dpnp/dpnp_algo/dpnp_algo.pyx
@@ -1,7 +1,7 @@
 # cython: language_level=3
 # -*- coding: utf-8 -*-
 # *****************************************************************************
-# Copyright (c) 2016-2020, Intel Corporation
+# Copyright (c) 2016-2022, Intel Corporation
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,6 @@ import numpy
 
 
 __all__ = [
-    "dpnp_arange",
     "dpnp_astype",
     "dpnp_flatten",
     "dpnp_init_val",
@@ -74,9 +73,6 @@ include "dpnp_algo_statistics.pyx"
 include "dpnp_algo_trigonometric.pyx"
 
 
-ctypedef c_dpctl.DPCTLSyclEventRef(*fptr_dpnp_arange_t)(c_dpctl.DPCTLSyclQueueRef,
-                                                        size_t, size_t, void *, size_t,
-                                                        const c_dpctl.DPCTLEventVectorRef)
 ctypedef c_dpctl.DPCTLSyclEventRef(*fptr_dpnp_astype_t)(c_dpctl.DPCTLSyclQueueRef,
                                                         const void *, void * , const size_t,
                                                         const c_dpctl.DPCTLEventVectorRef)
@@ -92,39 +88,6 @@ ctypedef c_dpctl.DPCTLSyclEventRef(*fptr_dpnp_initval_t)(c_dpctl.DPCTLSyclQueueR
                                                          const c_dpctl.DPCTLEventVectorRef)
 
 
-cpdef utils.dpnp_descriptor dpnp_arange(start, stop, step, dtype):
-    obj_len = int(numpy.ceil((stop - start) / step))
-    if obj_len < 0:
-        raise ValueError(f"DPNP dpnp_arange(): Negative array size (start={start},stop={stop},step={step})")
-
-    cdef tuple obj_shape = utils._object_to_tuple(obj_len)
-
-    cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
-    cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_ARANGE_EXT, param1_type, param1_type)
-
-    cdef utils.dpnp_descriptor result = utils.create_output_descriptor(obj_shape, kernel_data.return_type, None)
-
-    # for i in range(result.size):
-    #     result[i] = start + i
-
-    result_sycl_queue = result.get_array().sycl_queue
-
-    cdef c_dpctl.SyclQueue q = <c_dpctl.SyclQueue> result_sycl_queue
-    cdef c_dpctl.DPCTLSyclQueueRef q_ref = q.get_queue_ref()
-
-    cdef fptr_dpnp_arange_t func = <fptr_dpnp_arange_t > kernel_data.ptr
-    cdef c_dpctl.DPCTLSyclEventRef event_ref = func(q_ref,
-                                                    start,
-                                                    step,
-                                                    result.get_data(),
-                                                    result.size,
-                                                    NULL)  # dep_events_ref)
-    with nogil: c_dpctl.DPCTLEvent_WaitAndThrow(event_ref)
-    c_dpctl.DPCTLEvent_Delete(event_ref)
-
-    return result
-
-
 cpdef utils.dpnp_descriptor dpnp_astype(utils.dpnp_descriptor x1, dtype):
     cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(x1.dtype)
     cdef DPNPFuncType param2_type = dpnp_dtype_to_DPNPFuncType(dtype)
diff --git a/dpnp/dpnp_container.py b/dpnp/dpnp_container.py
@@ -34,18 +34,43 @@
 """
 
 
+import dpctl.utils as dpu
 import dpctl.tensor as dpt
 
 from dpnp.dpnp_array import dpnp_array
 import dpnp
 
 
 __all__ = [
+    "arange",
     "asarray",
     "empty",
 ]
 
 
+def arange(start,
+           /,
+           stop=None,
+           step=1,
+           *,
+           dtype=None,
+           device=None,
+           usm_type="device",
+           sycl_queue=None):
+    """Validate input parameters before passing them into `dpctl.tensor` module"""
+    dpu.validate_usm_type(usm_type, allow_none=False)
+    sycl_queue_normalized = dpnp.get_normalized_queue_device(sycl_queue=sycl_queue, device=device)
+
+    array_obj = dpt.arange(start,
+                           stop=stop,
+                           step=step,
+                           dtype=dtype,
+                           usm_type=usm_type,
+                           sycl_queue=sycl_queue_normalized)
+
+    return dpnp_array(array_obj.shape, buffer=array_obj)
+
+
 def asarray(x1,
             dtype=None,
             copy=False,
diff --git a/dpnp/dpnp_iface_arraycreation.py b/dpnp/dpnp_iface_arraycreation.py
diff --git a/dpnp/version.py b/dpnp/version.py
diff --git a/tests/skipped_tests_gpu.tbl b/tests/skipped_tests_gpu.tbl
diff --git a/tests/test_arraycreation.py b/tests/test_arraycreation.py
diff --git a/tests/test_sycl_queue.py b/tests/test_sycl_queue.py
