mindspore 1.10.0__cp37-cp37m-win_amd64.whl → 2.0.0rc1__cp37-cp37m-win_amd64.whl

mindspore/ops/operations/_map_tensor_ops.py

@@ -0,0 +1,112 @@
+# Copyright 2022 Huawei Technologies Co., Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============================================================================
+
+"""MapTensor operators."""
+
+from mindspore.ops import signature as sig
+from mindspore.ops.primitive import Primitive, prim_attr_register
+
+
+class MapTensorGet(Primitive):
+    """
+    Get or create value according the key tensor and default value in map tensor.
+    """
+    __mindspore_signature__ = (
+        sig.make_sig('map_tensor'),
+        sig.make_sig('key_tensor'))
+
+    @prim_attr_register
+    def __init__(self, insert_default_value):
+        """Initialize MapTensorGet"""
+        self.init_prim_io_names(inputs=['map_tensor', 'key_tensor'], outputs=['output'])
+        self.add_prim_attr('side_effect_mem', True)
+        self.insert_default_value = insert_default_value
+
+
+class MapTensorPut(Primitive):
+    """
+    Insert or update key value tensor pairs.
+    """
+    __mindspore_signature__ = (
+        sig.make_sig('map_tensor'),
+        sig.make_sig('key_tensor'),
+        sig.make_sig('value_tensor'))
+
+    @prim_attr_register
+    def __init__(self):
+        """Initialize MapTensorPut"""
+        self.init_prim_io_names(inputs=['map_tensor', 'key_tensor', 'value_tensor'], outputs=['output'])
+        self.add_prim_attr('side_effect_mem', True)
+
+
+class MapTensorErase(Primitive):
+    """
+    Remove records according the key tensor.
+    """
+    __mindspore_signature__ = (
+        sig.make_sig('map_tensor'),
+        sig.make_sig('key_tensor'))
+
+    @prim_attr_register
+    def __init__(self):
+        """Initialize MapTensorErase"""
+        self.init_prim_io_names(inputs=['map_tensor', 'key_tensor'], outputs=['output'])
+        self.add_prim_attr('side_effect_mem', True)
+
+
+class MapTensorGetKeys(Primitive):
+    """
+    Get all keys as a tensor.
+    """
+    __mindspore_signature__ = (sig.make_sig('map_tensor'),)
+
+    @prim_attr_register
+    def __init__(self):
+        """Initialize MapTensorGetKeys"""
+        self.init_prim_io_names(inputs=['map_tensor'], outputs=['output'])
+        self.add_prim_attr('side_effect_mem', True)
+
+
+class MapTensorGetValues(Primitive):
+    """
+    Get all values as a tensor.
+    """
+    __mindspore_signature__ = (sig.make_sig('map_tensor'),)
+
+    @prim_attr_register
+    def __init__(self):
+        """Initialize MapTensorGetValues"""
+        self.init_prim_io_names(inputs=['map_tensor'], outputs=['output'])
+        self.add_prim_attr('side_effect_mem', True)
+
+
+class MapTensorGetData(Primitive):
+    """
+    Get all keys and values as a tensor.
+    """
+    __mindspore_signature__ = (sig.make_sig('map_tensor'),)
+
+    @prim_attr_register
+    def __init__(self):
+        """Initialize MapTensorGetData"""
+        self.init_prim_io_names(inputs=['map_tensor'], outputs=['output'])
+        self.add_prim_attr('side_effect_mem', True)
+
+
+put = MapTensorPut()
+erase = MapTensorErase()
+get_keys = MapTensorGetKeys()
+get_values = MapTensorGetValues()
+get_data = MapTensorGetData()

mindspore/ops/operations/_ms_kernel.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============================================================================
-"""ms_kernel decorator and related util functions"""
+"""kernel decorator and related util functions"""
 
 import ast
 import json
@@ -284,25 +284,27 @@ class VariableUsage(ast.NodeVisitor):
 
         func_id = node.func.id
         if not (func_id in list(VariableUsage.intrin_runtime.keys()) +
-                ['max', 'min', 'len', 'ms_kernel']):
+                ['max', 'min', 'len', 'kernel', 'ms_kernel']):
             raise ValueError(
-                "In the function {} written in the Hybrid DSL, function call id {} "
-                "not in intrinsics' list".format(self.func_name, func_id))
+                "In the function [{}], function call id [{}] "
+                "not in intrinsics list of the Hybrid DSL. For the full support list, please refer to 'Hybrid DSL' "
+                "at https://www.mindspore.cn.".format(self.func_name, func_id))
         if (self.device == "Ascend" and func_id in list(VariableUsage.intrin_general.keys())) or \
                 (self.device == "CPU" and func_id in VariableUsage.intrin_cpu_not_support):
             raise ValueError(
-                "In the function {} written in the Hybrid DSL, function {} is not available on the "
-                "device {}".format(self.func_name, func_id, self.device))
+                "In the function [{}], function call id [{}] is not available on the "
+                "device {}. For the full support list, please refer to 'Hybrid DSL' "
+                "at https://www.mindspore.cn.".format(self.func_name, func_id, self.device))
         if func_id in list(VariableUsage.intrin_unary_op.keys()) + list(VariableUsage.intrin_general_unary_op.keys()) \
                 and len(node.args) != 1:
             raise TypeError(
-                "In the function {} written in the Hybrid DSL, function {} "
-                "expects one input, but get {}".format(self.func_name, func_id, len(node.args)))
+                "In the function [{}], function [{}] "
+                "expects one input, but get {}.".format(self.func_name, func_id, len(node.args)))
         if func_id in list(VariableUsage.intrin_bin_op.keys()) + list(VariableUsage.intrin_general_bin_op.keys()) + \
                 list(VariableUsage.intrin_buffer.keys()) and len(node.args) != 2:
             raise TypeError(
-                "In the function {} written in the Hybrid DSL, function {} "
-                "expects two inputs, but get {}".format(self.func_name, func_id, len(node.args)))
+                "In the function [{}], function [{}] "
+                "expects two inputs, but get {}.".format(self.func_name, func_id, len(node.args)))
         for elem in node.args:
             self.visit(elem)
 
@@ -474,13 +476,13 @@ def determine_variable_usage(root, func_name):
     return visitor.inplace_assign_output
 
 
-def ms_kernel(fn=None, reg_info=None, compile_attrs=None):
+def kernel(fn=None, reg_info=None, compile_attrs=None):
     """
     The decorator of the Hybrid DSL function for the Custom Op.
-    When a function written by the Hybrid DSL is decorated by ms_kernel,
+    When a function written by the Hybrid DSL is decorated by kernel,
     it can be run as a usual Python function.
-    Also, this function can be used in the api Custom and to create a Custom op, with func_type
-    "hybrid" or "pyfunc". Creating a custom op with mode "hybrid" by the Hybrid DSL function
+    Also, this function can be used in the api Custom and to create :class:`mindspore.ops.Custom`, with func_type
+    "hybrid" or "pyfunc". Creating :class:`mindspore.ops.Custom` with mode "hybrid" by the Hybrid DSL function
     will enjoy the automatic dtype/shape infer for free.
 
     Args:
@@ -499,7 +501,7 @@ def ms_kernel(fn=None, reg_info=None, compile_attrs=None):
     Examples:
         >>> import numpy as np
         >>> from mindspore import ops, Tensor
-        >>> from mindspore.ops import ms_kernel, DataType, CustomRegOp
+        >>> from mindspore.ops import kernel, DataType, CustomRegOp
         ...
         >>> # Create a dict for the compile flags.
         >>> attrs = {
@@ -520,9 +522,9 @@ def ms_kernel(fn=None, reg_info=None, compile_attrs=None):
         >>> input_x = np.ones([4, 4]).astype(np.float32)
         >>> input_y = np.ones([4, 4]).astype(np.float32)
         ...
-        >>> # Write a Hybrid DSL function through the decorator @ms_kernel.
+        >>> # Write a Hybrid DSL function through the decorator @kernel.
         >>> # We can also pass the compile attrs and the reg info through the decorator.
-        >>> @ms_kernel(reg_info=op_gpu_info, compile_attrs=attrs)
+        >>> @kernel(reg_info=op_gpu_info, compile_attrs=attrs)
         ... def outer_product(a, b):
         ...     c = output_tensor(a.shape, a.dtype)
         ...
@@ -548,23 +550,23 @@ def ms_kernel(fn=None, reg_info=None, compile_attrs=None):
         compile_attrs = {}
 
     if not isinstance(compile_attrs, dict):
-        raise TypeError("The input 'compile_attrs' of @ms_kernel must be a dict, "
+        raise TypeError("The input 'compile_attrs' of @kernel must be a dict, "
                         "but get a {}".format(type(compile_attrs)))
 
     for key in compile_attrs.keys():
         if not isinstance(key, str):
-            raise TypeError("The key of 'compile_attrs' of @ms_kernel must be a str, "
+            raise TypeError("The key of 'compile_attrs' of @kernel must be a str, "
                             "but get a {}".format(type(key)))
 
     if reg_info is not None and not isinstance(reg_info, (str, dict, tuple)):
         raise TypeError(
-            "The input 'reg_info' of @ms_kernel should be one of "
+            "The input 'reg_info' of @kernel should be one of "
             "str, dict and tuple, but get a {}".format(type(reg_info)))
 
     def wrap_ms_kernel(func):
         setattr(func, "ms_kernel_flag", True)
 
-        # we enable ml scheduler automatically for ms_kernel function
+        # we enable ml scheduler automatically for kernel function
         if context.get_context('device_target') == "Ascend":
             compile_attrs["enable_polytops"] = "always"
 
@@ -586,14 +588,14 @@ def ms_kernel(fn=None, reg_info=None, compile_attrs=None):
     return wrap_ms_kernel
 
 
-def ms_hybrid(fn=None, reg_info=None, compile_attrs=None):
+def ms_kernel(fn=None, reg_info=None, compile_attrs=None):
     """
-    Same as docarator ms_kernel. ms_hybrid will be deprecated in the future.
-    Please use ms_kernel instead.
+    Same as docarator kernel. ms_hybrid will be deprecated in the future.
+    Please use kernel instead.
 
     Supported Platforms:
         Deprecated
     """
-    log.warning("'ms_hybrid' is deprecated from version 1.8 and "
-                "will be removed in a future version, use 'ms_kernel' instead.")
-    return ms_kernel(fn, reg_info, compile_attrs)
+    log.warning("'ms_kernel' is deprecated from version 1.8 and "
+                "will be removed in a future version, use 'kernel' instead.")
+    return kernel(fn, reg_info, compile_attrs)

mindspore/ops/operations/_ocr_ops.py

@@ -16,8 +16,8 @@
 """Inner OCR operators."""
 
 from __future__ import absolute_import
-from ..primitive import PrimitiveWithInfer, Primitive, prim_attr_register
-from ...common import dtype as mstype
+from mindspore.ops.primitive import PrimitiveWithInfer, Primitive, prim_attr_register
+from mindspore.common import dtype as mstype
 
 
 class GetShape(PrimitiveWithInfer):
@@ -70,7 +70,7 @@ class OCRDetectionPreHandle(PrimitiveWithInfer):
     This operator is used to prehandle images in ocr detection.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Args:
         data_format (str): Data format of the tensor passed to operator, is 'NHWC' or 'NCHW'. Default: "NHWC"
@@ -107,7 +107,7 @@ class OCRFindContours(PrimitiveWithInfer):
     Find contours of the images.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Args:
         value_mode (int): Binarization mode.
@@ -140,7 +140,7 @@ class BatchDilatePolys(PrimitiveWithInfer):
     Batch dilate polygons according to expand_scale.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Inputs:
         - **polys_data** (Tensor) - Point data of every contours. The data type must be int32.
@@ -179,7 +179,7 @@ class ResizeAndClipPolys(PrimitiveWithInfer):
     Resize the dilated polygons according to scales.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Inputs:
         - **polys_data** (Tensor) - Point data of every contours. The data type must be int32.
@@ -219,7 +219,7 @@ class OCRDetectionPostHandle(PrimitiveWithInfer):
     This operator is used to posthandle images in ocr detection.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Inputs:
         - **img** (Tensor) - Original image tensor. The data type must be uint8.
@@ -252,7 +252,7 @@ class OCRIdentifyPreHandle(PrimitiveWithInfer):
     This operator is used to prehandle images in ocr identification.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Args:
         size (Union[tuple[int], list[int]]): Image size after prehandle.
@@ -288,7 +288,7 @@ class OCRRecognitionPreHandle(Primitive):
     This operator is used to prehandle images in ocr recognition.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Args:
         batch_size (int): Image batch size of each partition.
@@ -320,7 +320,7 @@ class BatchEnqueue(PrimitiveWithInfer):
     This operator is used to batch input x according to attr batch_size and enqueue.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Args:
         batch_size (int): Image batch size of each dequeue.
@@ -352,7 +352,7 @@ class Dequeue(PrimitiveWithInfer):
     This operator is used to dequeue data according to queue_id.
 
     .. warning::
-        This is an experimental prototype that is subject to change and/or deletion.
+        This is an experimental API that is subject to change or deletion.
 
     Args:
         output_type (mstype): Data output type.

mindspore/ops/operations/_opaque_predicate_registry.py

@@ -0,0 +1,41 @@
+# Copyright 2022 Huawei Technologies Co., Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============================================================================
+
+"""Register pyfunc for opaque_func_cpu_kernel"""
+
+from mindspore.ops._register_for_op import OpaquePredicateRegistry
+
+
+registered_func_name = OpaquePredicateRegistry()
+
+
+def add_opaque_predicate(fn_name, func):
+    """restore opaque predicate functions"""
+    registered_func_name.register(fn_name, func)
+
+
+def get_opaque_predicate(fn_name):
+    """get opaque predicate function by their name"""
+    return registered_func_name.get(fn_name)
+
+
+def get_func_names():
+    """get function names"""
+    return registered_func_name.func_names
+
+
+def clean_funcs():
+    """clean restored functions"""
+    registered_func_name.func_names = []