move create_container() to separate py file (#880)

Author: shssf

dpnp/dpnp_container.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# *****************************************************************************
+# Copyright (c) 2016-2020, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+# *****************************************************************************
+
+"""
+Container specific part of the DPNP
+
+Notes
+-----
+This module contains code and dependency on diffrent containers used in DPNP
+
+"""
+
+
+import dpnp.config as config
+from dpnp.dparray import dparray
+
+import numpy
+
+
+try:
+    """
+    Detect DPCtl availability to use data container
+    """
+    import dpctl.tensor as dpctl
+
+    config.__DPNP_DPCTL_AVAILABLE__ = True
+
+except ImportError:
+    """
+    No DPCtl data container available
+    """
+    config.__DPNP_DPCTL_AVAILABLE__ = False
+
+# config.__DPNP_DPCTL_AVAILABLE__ = False
+
+
+__all__ = [
+    "create_output_container"
+]
+
+
+def create_output_container(shape, type):
+    if config.__DPNP_OUTPUT_NUMPY__:
+        """ Create NumPy ndarray """
+        # TODO need to use "buffer=" parameter to use SYCL aware memory
+        result = numpy.ndarray(shape, dtype=type)
+    elif config.__DPNP_DPCTL_AVAILABLE__:
+        """ Create DPCTL array """
+        result = dpctl.usm_ndarray(shape, dtype=numpy.dtype(type).name)
+    else:
+        """ Create DPNP array """
+        result = dparray(shape, dtype=type)
+
+    return result    

dpnp/dpnp_iface_arraycreation.py

@@ -200,7 +200,7 @@ def array(x1, dtype=None, copy=True, order='C', subok=False, ndmin=0, like=None)
         # usm_array has no element wise assignment (aka []) and
         # has no "flat" property and
         # "usm_data.copy_from_host" doesn't work with diffrent datatypes
-        pass
+        return numpy.array(x1, dtype=dtype, copy=copy, order=order, subok=subok, ndmin=ndmin)
     elif subok is not False:
         pass
     elif copy is not True:

dpnp/dpnp_utils/dpnp_algo_utils.pyx

@@ -35,6 +35,7 @@ import numpy
 import dpnp.config as config
 import dpnp
 from dpnp.dpnp_algo cimport dpnp_DPNPFuncType_to_dtype, dpnp_dtype_to_DPNPFuncType, get_dpnp_function_ptr
+from dpnp.dpnp_container import create_output_container
 from libcpp cimport bool as cpp_bool
 from libcpp.complex cimport complex as cpp_complex
 
@@ -44,21 +45,6 @@ cimport cpython
 cimport cython
 cimport numpy
 
-try:
-    """
-    Detect DPCtl availability to use data container
-    """
-    import dpctl.tensor as dpctl
-
-    config.__DPNP_DPCTL_AVAILABLE__ = True
-
-except ImportError:
-    """
-    No DPCtl data container available
-    """
-    config.__DPNP_DPCTL_AVAILABLE__ = False
-
-# config.__DPNP_DPCTL_AVAILABLE__ = False
 
 """
 Python import functions
@@ -384,20 +370,6 @@ cdef DPNPFuncType get_output_c_type(DPNPFuncName funcID,
     checker_throw_value_error("get_output_c_type", "dtype and out", requested_dtype, requested_out)
 
 
-def create_output_container(shape, type):
-    if config.__DPNP_OUTPUT_NUMPY__:
-        """ Create NumPy ndarray """
-        # TODO need to use "buffer=" parameter to use SYCL aware memory
-        result = numpy.ndarray(shape, dtype=type)
-    elif config.__DPNP_DPCTL_AVAILABLE__:
-        """ Create DPCTL array """
-        result = dpctl.usm_ndarray(shape, dtype=numpy.dtype(type).name)
-    else:
-        """ Create DPNP array """
-        result = dparray(shape, dtype=type)
-
-    return result    
-    
 cdef dpnp_descriptor create_output_descriptor(shape_type_c output_shape,
                                               DPNPFuncType c_type,
                                               dpnp_descriptor requested_out):