Merge branch 'master' into use_dpctl_arange

Author: antonwolfy

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