mindspore 2.4.1__cp311-cp311-macosx_11_0_arm64.whl → 2.5.0__cp311-cp311-macosx_11_0_arm64.whl

mindspore/.commit_id

@@ -1 +1 @@
-__commit_id__ = ''[sha1]:01847825,[branch]:(HEAD,origin/r2.4.1,r2.4.1)''
+__commit_id__ = ''[sha1]:241c405d,[branch]:(HEAD,origin/master,origin/HEAD,master)''

mindspore/__init__.py

@@ -17,13 +17,17 @@ from __future__ import absolute_import
 
 from mindspore.run_check import run_check
 from mindspore import common, dataset, mindrecord, train, log, amp
-from mindspore import profiler, communication, numpy, parallel, hal
+from mindspore import profiler, communication, numpy, parallel, hal, runtime, device_context
 from mindspore.common import *
+from mindspore.common import _tensor_docs
+del _tensor_docs
 from mindspore.mindrecord import *
 from mindspore.ops import _op_impl, grad, value_and_grad, vjp, jvp, jacfwd, jacrev, vmap, get_grad, constexpr, reshard
 from mindspore.train import *
 from mindspore.log import *
 from mindspore.utils import *
+from mindspore.device_manager import *
+from mindspore.runtime import *
 from mindspore.context import GRAPH_MODE, PYNATIVE_MODE, set_context, get_context, set_auto_parallel_context, \
     get_auto_parallel_context, reset_auto_parallel_context, ParallelMode, set_ps_context, \
     get_ps_context, reset_ps_context, set_offload_context, get_offload_context, STRICT, COMPATIBLE, LAX
@@ -31,8 +35,7 @@ from mindspore.version import __version__
 from mindspore.profiler import Profiler, EnvProfiler
 from mindspore.parallel import set_algo_parameters, get_algo_parameters, reset_algo_parameters, \
     rank_list_for_transform, transform_checkpoint_by_rank, transform_checkpoints, merge_pipeline_strategys, shard, \
-    Layout, sync_pipeline_shared_parameters, parameter_broadcast, load_segmented_checkpoints, \
-    safetensors_to_ckpt, ckpt_to_safetensors, unified_safetensors
+    Layout, sync_pipeline_shared_parameters, parameter_broadcast, load_segmented_checkpoints, unified_safetensors
 from mindspore.rewrite import SymbolTree, ScopedValue, Node, NodeType
 from mindspore.safeguard import obfuscate_ckpt, load_obf_params_into_net
 from mindspore._check_jit_forbidden_api import get_obj_module_and_name_info, is_jit_forbidden_module, \
@@ -50,4 +53,6 @@ __all__.extend(context.__all__)
 __all__.extend(parallel.__all__)
 __all__.extend(rewrite.__all__)
 __all__.extend(safeguard.__all__)
+__all__.extend(device_manager.__all__)
+__all__.extend(runtime.__all__)
 __all__.append("Profiler")

mindspore/_checkparam.py

@@ -1373,11 +1373,6 @@ def args_type_check(*type_args, **type_kwargs):
 
 def check_hook_fn(hook_type, hook_fn):
     """Check hook fn"""
-    if context.get_context("mode") != context.PYNATIVE_MODE:
-        logger.warning(f"'{hook_type}' function is only supported in pynative mode, you can use "
-                       f"context.set_context to set pynative mode.")
-        return False
-
     if not isinstance(hook_fn, (FunctionType, MethodType)):
         raise TypeError(f"When using 'hook_type(hook_fn)', the type of 'hook_fn' must be python "
                         f"function, but got {type(hook_fn)}.")

mindspore/_extends/parallel_compile/akg_compiler/gen_custom_op_files.py

@@ -23,7 +23,7 @@ from itertools import product
 
 SUPPORTED_INPUT_NUM = [1, 2, 3, 4, 5, 6, 7]
 SUPPORTED_OUTPUT_NUM = [1, 2, 3, 4, 5]
-SUPPORTED_DEVICE_ARCH = ["ascend910", "ascend910b"]
+SUPPORTED_DEVICE_ARCH = ["ascend910", "ascend910b", "ascend910_93"]
 VALUE_ALL = "all"
 VALUE = "value"
 NAME = "name"

mindspore/_extends/parse/compile_config.py

@@ -267,6 +267,64 @@ Value Range:
 """
 STRICT_CHECK_PARENT_CONTEXT = ''
 
+"""
+Name: CELL_PARAMETER_HOOK
+Function: Whether to enable cell parameter hook.
+          Cell parameter hook is an experimental api that may be deleted later.
+Value Range:
+    1: Enable
+    Default: Disable
+"""
+CELL_PARAMETERS_HOOK = ''
+
+"""
+Name: CHECK_BPROP
+Function: Whether to check back propagation nodes. The checking ensures that the shape and dtype of
+          back propagation node outputs is the same as input parameters.
+Value Range:
+    1: Enable
+    Default: Disable.
+"""
+CHECK_BPROP = ''
+
+"""
+Name: GRAD_FOR_SCALAR
+Function: Whether to get gradient for scalar. When enable, the function's scalar input can be derived.
+          Because the back-end does not support scaling operations currently, this interface only
+          supports simple operations that can be deduced by the front-end.
+Value Range:
+    1: Enable
+    Default: Disable.
+"""
+GRAD_FOR_SCALAR = ''
+
+"""
+Name: DEBUG_LEVEL
+Function: Whether to record more debug information in compiling process. Used for debugging when errors occur.
+Value Range:
+    1: Enable
+    Default: Disable.
+"""
+DEBUG_LEVEL = ''
+
+"""
+Name: PYNATIVE_JIT_GRAD_MODE
+Function: Which method used for grad jit in pynative mode
+Value Range:
+    1: Replace ValueNode
+    Default: Parametrization
+"""
+PYNATIVE_JIT_GRAD_MODE = ''
+
+"""
+Name: PUT_ALL_CNODE_INTO_ORDER_LIST
+Function: Whether to put all CNode into order list in back prop.
+Value Range:
+    0: Disable
+    Default: Enable.
+"""
+PUT_ALL_CNODE_INTO_ORDER_LIST = ''
+
 __all__ = [
     "COMPILE_PROFILE",
     "COMPILE_PROFILE_FINISH_ACTION",
@@ -296,4 +354,10 @@ __all__ = [
     "ENABLE_RECOMPUTE_BEFORE_INLINE",
     "STRICT_CHECK_PARENT_CONTEXT",
     "AUTO_PASSES_OPTIMIZE_PATH",
+    "CELL_PARAMETERS_HOOK",
+    "CHECK_BPROP",
+    "GRAD_FOR_SCALAR",
+    "DEBUG_LEVEL",
+    "PYNATIVE_JIT_GRAD_MODE",
+    "PUT_ALL_CNODE_INTO_ORDER_LIST",
 ]

mindspore/_extends/parse/deprecated/deprecated_tensor_method.py

@@ -0,0 +1,375 @@
+# This is the Python adaptation and derivative work of Myia (https://github.com/mila-iqia/myia/).
+#
+# Copyright 2024 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.
+# ============================================================================
+"""Deprecated Tensor method"""
+
+deprecated_tensor_method_map = {
+    # 1 to
+
+    # 2 masked_fill
+
+    # 3 abs
+
+    # 4 __abs__
+
+    # 5 add
+    "add": "deprecated_tensor_add",
+    "add_": "deprecated_tensor_add_",
+    # 6 all
+    "all": "tensor_all",
+    # 7 allclose
+    "allclose": "tensor_allclose",
+    # 8 any
+    "any": "tensor_any",
+    # 9 arctan2
+    "arctan2": "tensor_arctan2",
+    # 10 argmax
+    "argmax": "deprecated_tensor_argmax",
+    # 11 argmin
+    "argmin": "deprecated_tensor_argmin",
+    # 12 argsort
+    "argsort": "deprecated_tensor_argsort",
+    # 13 atan2
+    "atan2": "tensor_atan2",
+    # 14 bfloat16
+
+    # 15 bmm
+
+    # 16 bool
+
+    # 17 broadcast_to
+
+    # 18 byte
+
+    # 19 ceil
+
+    # 20 chunk
+    "chunk": "deprecated_tensor_chunk",
+    # 21 clamp
+
+    # 22 clip
+
+    # 23 cos
+
+    # 24 cumprod
+
+    # 25 cumsum
+    "cumsum": "deprecated_tensor_cumsum",
+    # 26 dim
+
+    # 27 div
+    "div": "tensor_div",
+    # 28 divide
+
+    # 29 eq
+
+    # 30 erf
+
+    # 31 exp
+
+    # 32 expand
+
+    # 33 expand_as
+    "expand_as": "deprecated_tensor_expand_as",
+    # 34 flatten
+    "flatten": "deprecated_tensor_flatten",
+    # 35 flip
+
+    # 36 float
+
+    # 37 floor
+
+    # 38 gather
+    "gather": "deprecated_tensor_gather",
+    # 39 greater
+
+    # 40 greater_equal
+
+    # 41 gt
+
+    # 42 half
+
+    # 43 index_put
+
+    # 44 index_select
+    "index_select": "deprecated_tensor_index_select",
+    # 45 int
+
+    # 46 inverse
+    "inverse": "deprecated_tensor_inverse",
+    # 47 is_contiguous
+
+    # 48 isclose
+    "isclose": "deprecated_tensor_isclose",
+    # 49 isfinite
+
+    # 50 isnan
+
+    # 51 item
+
+    # 52 le
+
+    # 53 less
+
+    # 54 less_equal
+
+    # 55 log
+
+    # 56 log2
+    "log2": "tensor_log2",
+    # 57 logical_and
+    "logical_and": "tensor_logical_and",
+    # 58 logical_not
+
+    # 59 logical_or
+    "logical_or": "tensor_logical_or",
+
+    # 60 long
+
+    # 61 lt
+
+    # 62 masked_fill
+
+    # 63 masked_select
+
+    # 64 matmul
+    "matmul": "deprecated_tensor_matmul",
+    # 65 max
+    "max": "deprecated_tensor_max",
+    # 66 maximum
+
+    # 67 mean
+    "mean": "deprecated_tensor_mean",
+    # 68 min
+    "min": "deprecated_tensor_min",
+    # 69 minimum
+
+    # 70 mul
+
+    # 71 nan_to_num
+
+    # 72 narrow
+    "narrow": "deprecated_tensor_narrow",
+    # 73 ne
+
+    # 74 neg
+
+    # 75 negative
+
+    # 76 nonzero
+
+    # 77 norm
+
+    # 78 numel
+
+    # 79 numpy
+
+    # 80 outer
+    "outer": "deprecated_tensor_outer",
+    # 81 permute
+
+    # 82 pow
+    "pow": "deprecated_tensor_pow",
+    # 83 prod
+    "prod": "deprecated_tensor_prod",
+    # 84 reciprocal
+
+    # 85 remainder
+    "remainder": "deprecated_tensor_remainder",
+
+    # 86 repeat
+
+    # 87 repeat_interleave
+    "repeat_interleave": "deprecated_tensor_repeat_interleave",
+    # 88 reshape
+
+    # 89 round
+
+    # 90 rsqrt
+
+    # 91 scatter
+    "scatter": "deprecated_tensor_scatter",
+
+    # 92 scatter_add
+    "scatter_add": "deprecated_tensor_scatter_add",
+    # 93 select
+    "select": "deprecated_tensor_select",
+    # 94 sigmoid
+
+    # 95 sin
+
+    # 96 size
+
+    # 97 sort
+    "sort": "deprecated_tensor_sort",
+    # 98 split
+    "split": "deprecated_tensor_split",
+    # 99 sqrt
+
+    # 100 square
+
+    # 101 squeeze
+
+    # 102 std
+    "std": "deprecated_tensor_std",
+    # 103 sub
+    "sub": "deprecated_tensor_sub",
+    # 104 sum
+    "sum": "deprecated_tensor_sum",
+    # 105 swapaxes
+
+    # 106 t
+    "t": "deprecated_tensor_t",
+    # 107 tanh
+
+    # 108 tile
+    "tile": "deprecated_tensor_tile",
+    # 109 tolist
+
+    # 110 topk
+    "topk": "deprecated_tensor_topk",
+    # 111 transpose
+    "transpose": "deprecated_tensor_transpose",
+    # 112 tril
+    "tril": "deprecated_tensor_tril",
+    # 113 trunc
+
+    # 114 type
+
+    # 115 type_as
+    "type_as": "deprecated_tensor_type_as",
+    # 116 unbind
+    "unbind": "deprecated_tensor_unbind",
+    # 117 unfold
+
+    # 118 unique
+    "unique": "deprecated_tensor_unique",
+    # 119 unsqeeze
+
+    # 120 view
+
+    # 121 contiguous
+
+    # 122 where
+    "where": "deprecated_tensor_where",
+    # 123 div_
+
+    # 124 fill_
+
+    # 125 floor_
+
+    # 126 masked_fill_
+
+    # 127 mul_
+
+    # 128 normal_
+
+    # 129 requires_grad_
+
+    # 130 sub_
+    "sub_": "deprecated_tensor_sub_",
+    # 131 uniform_
+
+    # 132 absolute
+
+    # 133 bincount
+    "bincount": "tensor_bincount",
+    # 134 diff
+
+    # 135 double
+
+    # 136 lcm
+
+    # 137 mm
+    "mm": "deprecated_tensor_mm",
+    # 138 ravel
+
+    # 139 nelement
+
+    # 140 stride
+
+    # 141 indices
+
+    # 142 view_as
+    "view_as": "deprecated_tensor_view_as",
+    # 143 values
+
+    # 144 index_copy
+
+    # 145 element_size
+
+    # 146 gcd
+
+    # 147 isinf
+
+    # 148 not_equal
+
+    # 149 triu
+
+    # 150 __eq__
+
+    # 151
+
+    # 152
+    'median': 'deprecated_tensor_median',
+
+    # 153 acos, arccos; acosh, arccosh, asin, arcsin; asinh, arcsinh; atan, arctan; dot
+    "acos": "deprecated_tensor_acos",
+    "arccos": "deprecated_tensor_arccos",
+    "acosh": "deprecated_tensor_acosh",
+    "arccosh": "deprecated_tensor_arccosh",
+    "asin": "deprecated_tensor_asin",
+    "arcsin": "deprecated_tensor_arcsin",
+    "asinh": "deprecated_tensor_asinh",
+    "arcsinh": "deprecated_tensor_arcsinh",
+    "atan": "deprecated_tensor_atan",
+    "arctan": "deprecated_tensor_arctan",
+    "dot": "deprecated_tensor_dot",
+
+    # 153
+
+    # 154
+
+    # 155
+
+    # 156
+
+    # 157
+
+    # 158
+    "unsqueeze": "deprecated_tensor_unsqueeze",
+    # 159 histc
+    "histc": "tensor_histc",
+
+    # 160 frac
+    "frac": "tensor_frac",
+
+    # 161
+    "fmod": "deprecated_tensor_fmod",
+    # 162 log10
+    "log10": "tensor_log10",
+
+    # 501
+    "addbmm": "deprecated_tensor_addbmm",
+    # 931
+    "nansum": "deprecated_tensor_nansum",
+    # 502
+    "addmm": "deprecated_tensor_addmm",
+    # 790 addmv
+    "addmv": "deprecated_tensor_addmv",
+    # 1028
+    "var": "deprecated_tensor_var",
+}

mindspore/_extends/parse/parser.py

@@ -107,7 +107,22 @@ MODULE_FROM_USER_WORKSPACE = 2
 # Process expr statement white list
 # Add as needed, eg: "clear", "extend", "insert", "remove", "reverse"
 parse_expr_statement_white_list = (
-    "append", "insert", "clear", "reverse", "extend", "update",
+    "append", "insert", "clear", "reverse", "extend", "update", "register_hook",
+)
+
+# Methods that need to reorder after it's caller is used before
+# e.g. We need to reorder `x.register_hook` after x is used in `out = x + 1` when `register_hook` is called.
+# def construct(x):
+#     out = x + 1
+#     x.register_hook(hook_fn)
+#     return out
+# equals to:
+# def construct(x):
+#     x = x.register_hook(hook_fn) # register_hook will return itself when it is called in the graph (in `GRAPH_MODE`).
+#     out = x + 1
+#     return out
+_need_reorder_methods = (
+    "register_hook",
 )
 
 _builtin_function_or_method_type = type(abs)
@@ -666,7 +681,7 @@ def expand_expr_statement(node):
     Process the expr statement and expand it.
 
     Returns:
-        tuple, (True, expr.value, x)/(False, None, None).
+        (False,)/(True, expr.value, target, bool)/(True, expr.value).
     """
     if isinstance(node, ast.Expr):
         expr_value = node.value
@@ -679,7 +694,7 @@ def expand_expr_statement(node):
                 target = func.value
                 if method in parse_expr_statement_white_list:
                     logger.debug("Expand expr, target:%s, method:%s", target, method)
-                    return True, expr_value, target
+                    return True, expr_value, target, method in _need_reorder_methods
         if not isinstance(expr_value, ast.Str):
             return True, expr_value
     return (False,)
@@ -1075,7 +1090,9 @@ def is_ms_tensor_method(obj):
     if not hasattr(obj, '__name__') or not hasattr(Tensor, obj.__name__):
         return False
     fn = inspect.unwrap(obj.__func__ if isinstance(obj, types.MethodType) else obj)
-    return fn == getattr(Tensor, obj.__name__)
+    tensor_method = getattr(Tensor, obj.__name__)
+    tensor_method = tensor_method.__func__ if hasattr(tensor_method, "__func__") else tensor_method
+    return fn == tensor_method
 
 
 def can_constant_fold(obj):
@@ -1224,7 +1241,8 @@ class Parser:
                 self.col_offset = \
                     len(original_src.split('\n')[0]) - len(src.split('\n')[0])
                 logger.debug("Get source: %s", src)
-                self.check_lambda(src)
+                if not hasattr(self.fn, attr):
+                    self.check_lambda(src)
                 try:
                     ast_tokens = asttokens.ASTTokens(src, parse=True)
                 except IndentationError as idt_err: