mindspore 2.1.0__cp38-cp38-manylinux1_x86_64.whl → 2.2.0__cp38-cp38-manylinux1_x86_64.whl

mindspore/rewrite/symbol_tree_builder.py

@@ -13,54 +13,15 @@
 # limitations under the License.
 # ============================================================================
 """SymbolTree builder."""
-from copy import copy
 from typing import Optional
 import ast
 import inspect
 
 from mindspore.nn import Cell
 from .symbol_tree import SymbolTree
-from .node import TreeNode
-from .parser_register import ParserRegister
-from .parser import Parser
+from .parsers.parser_register import ParserRegister
+from .parsers.parser import Parser
 from .ast_transformers import FlattenRecursiveStmt
-from .ast_helpers import AstModifier
-from .ast_helpers import AstFinder
-
-
-class FunctionSymbolTreeBuilder:
-    """Create function SymbolTree"""
-    def __init__(self, network: Cell, ast_root):
-        self._origin_net = network
-        self._ast_root: ast.Module = ast_root
-        self._root_tree: Optional[SymbolTree] = None
-
-    @staticmethod
-    def _ast_transform(ast_root: ast.AST) -> ast.AST:
-        """
-        Optimize ast before parse.
-
-        Args:
-             ast_root (ast.AST): An instance of ast to be optimized.
-
-        Returns:
-             An instance of ast been optimized.
-        """
-        transform_list = [FlattenRecursiveStmt()]
-        for transformer in transform_list:
-            ast_root = transformer.transform(ast_root)
-        return ast_root
-
-    def build(self) -> SymbolTree:
-        """
-        Build SymbolTree.
-
-        Returns:
-             An instance of SymbolTree.
-        """
-        self._root_tree: SymbolTree = SymbolTree(self._origin_net, self._ast_root)
-        self._root_tree.finish_build()
-        return self._root_tree
 
 
 class SymbolTreeBuilder:
@@ -71,6 +32,9 @@ class SymbolTreeBuilder:
          network (Cell): An instance of Cell represents a network from which SymbolTree will be built.
     """
 
+    # Entry function of the forward computation process
+    entry_function = "construct"
+
     def __init__(self, network: Cell):
         if not isinstance(network, Cell):
             raise RuntimeError("Only support network with Cell type now, ", network)
@@ -78,32 +42,9 @@ class SymbolTreeBuilder:
         network_str = inspect.getsource(type(network))
         self._ast_root: ast.Module = ast.parse(network_str)
         self._root_tree: Optional[SymbolTree] = None
-        if isinstance(network, Cell) and network.jit_config_dict:
-            self._jit_config_dict = network.jit_config_dict
-
-    @staticmethod
-    def merge_module_of_subtree(main_tree: SymbolTree, sub_stree: SymbolTree):
-        """
-        Merge ast.Module of sub-network into ast.Module of main-network.
-
-        1. Merge imports of ast.Module.
-        2. Merge classes of ast.Module.
-        3. Use merged ast.Module as module of main-network and sub-network.
-        """
-
-        if sub_stree.get_ori_cls_name() == "SequentialCell":
-            SymbolTreeBuilder._erase_unused_func_of_sequentialcell(sub_stree.get_class_ast())
-        father_mod = main_tree.get_module_ast()
-        sub_mod = sub_stree.get_module_ast()
-        # Tree Node created by internal/external function has no module ast
-        if not sub_mod:
-            return
-        SymbolTreeBuilder._merge_import_of_module(father_mod, sub_mod)
-        SymbolTreeBuilder._merge_class_of_module(father_mod, sub_mod)
-        sub_stree.set_module_ast(father_mod)
 
     @staticmethod
-    def _ast_transform(ast_root: ast.AST) -> ast.AST:
+    def ast_transform(ast_root: ast.AST) -> ast.AST:
         """
         Optimize ast before parse.
 
@@ -113,63 +54,9 @@ class SymbolTreeBuilder:
         Returns:
              An instance of ast been optimized.
         """
-        transform_list = [FlattenRecursiveStmt()]
-        for transformer in transform_list:
-            ast_root = transformer.transform(ast_root)
+        ast_root = FlattenRecursiveStmt().transform(ast_root, [SymbolTreeBuilder.entry_function])
         return ast_root
 
-    @staticmethod
-    def _merge_import_of_module(main_mod: ast.Module, sub_mod: ast.Module):
-        """
-        Merge imports of ast.Module of sub-network to ast.Module of main-network.
-
-        Note:
-            Imports of sub_module would be added ahead of imports in main_module.
-
-            Error will occur if import name is over-load because of alise.
-
-        Args:
-             main_mod (ast.Module): An ast.Module corresponding to main-network.
-             sub_mod (ast.Module): An ast.Module corresponding to sub-network.
-
-        """
-
-        sub_mod_finder = AstFinder(sub_mod)
-        main_mod_finder = AstFinder(main_mod)
-        imports_in_sub = copy(sub_mod_finder.find_all((ast.Import, ast.ImportFrom)))
-        imports_in_main = copy(main_mod_finder.find_all((ast.Import, ast.ImportFrom)))
-        first_import = imports_in_main[0]
-        for clazz in imports_in_sub:
-            AstModifier.insert_sub_ast(main_mod, clazz, first_import, True)
-
-    @staticmethod
-    def _merge_class_of_module(main_mod: ast.Module, sub_mod: ast.Module):
-        """
-        Merge classes of ast.Module of sub-network to ast.Module of main-network.
-
-        Note:
-            Classes of sub_module would be added ahead of classes in main_module.
-
-        Args:
-             main_mod (ast.Module): An ast.Module corresponding to main-network.
-             sub_mod (ast.Module): An ast.Module corresponding to sub-network.
-
-        """
-
-        sub_mod_finder = AstFinder(sub_mod)
-        main_mod_finder = AstFinder(main_mod)
-        classes_in_sub = copy(sub_mod_finder.find_all(ast.ClassDef))
-        classes_in_main = copy(main_mod_finder.find_all(ast.ClassDef))
-        first_class = classes_in_main[0]
-        for clazz in classes_in_sub:
-            AstModifier.insert_class_into_module(main_mod, clazz, first_class, True)
-
-    @staticmethod
-    def _erase_unused_func_of_sequentialcell(ast_class: ast.ClassDef):
-        func_names = ("__getitem__", "__setitem__", "__delitem__", "__len__", "append")
-        for name in func_names:
-            AstModifier.erase_func_from_class_by_name(ast_class, name)
-
     def build(self) -> SymbolTree:
         """
         Build SymbolTree.
@@ -178,83 +65,12 @@ class SymbolTreeBuilder:
              An instance of SymbolTree.
         """
 
-        self._ast_root = SymbolTreeBuilder._ast_transform(self._ast_root)
+        self._ast_root = SymbolTreeBuilder.ast_transform(self._ast_root)
         if not isinstance(self._ast_root, ast.Module):
             raise RuntimeError("ast_root should be a ast.Module")
         self._root_tree: SymbolTree = SymbolTree(self._origin_net, self._ast_root)
         parser: Parser = ParserRegister.instance().get_parser(ast.Module)
-        parser.process(self._root_tree, self._ast_root)
-        self._merge_module_of_subtrees()
-        self._reduce_redundant_import()
-        self._insert_file_path()
+        parser.process(self._root_tree, self._ast_root, None)
         ast.fix_missing_locations(self._root_tree.get_module_ast())
         self._root_tree.finish_build()
         return self._root_tree
-
-    def _merge_module_of_subtrees(self):
-        """
-        Merge ast.Module of all sub-networks into ast.Module of main-network.
-
-        1. Merge imports of ast.Module.
-        2. Merge classes of ast.Module.
-        3. Use merged ast.Module as module of main-network and sub-network.
-        """
-
-        for node in self._root_tree.nodes():
-            if isinstance(node, TreeNode) and node.get_instance():
-                SymbolTreeBuilder.merge_module_of_subtree(self._root_tree, node.symbol_tree)
-
-    def _reduce_redundant_import(self):
-        """
-        Reduce redundant imports of ast.Module.
-
-        Redundant imports may be introduced into ast.Module while merging ast.Module of sub-network to main-network.
-        """
-
-        module: ast.Module = self._root_tree.get_module_ast()
-        import_list = []
-        exist_import = []
-        exist_import_from = []
-        for body in module.body:
-            if isinstance(body, ast.Import):
-                names = body.names
-                for name in names:
-                    import_hash = hash((name.name, name.asname))
-                    if import_hash in exist_import:
-                        continue
-                    exist_import.append(import_hash)
-                    import_list.append(ast.Import(names=[ast.alias(name=name.name, asname=name.asname)]))
-            if isinstance(body, ast.ImportFrom):
-                import_module = body.module
-                names = body.names
-                for name in names:
-                    import_hash = hash((import_module, name.name, name.asname))
-                    if import_hash in exist_import_from:
-                        continue
-                    exist_import_from.append(import_hash)
-                    import_list.append(ast.ImportFrom(module=import_module,
-                                                      names=[ast.alias(name=name.name, asname=name.asname)],
-                                                      level=0))
-        insert_pos = None
-        for i in range(len(module.body) - 1, -1, -1):
-            body = module.body[i]
-            if not isinstance(body, (ast.Import, ast.ImportFrom)):
-                insert_pos = body
-                continue
-            module.body.pop(i)
-        for import_ast in import_list:
-            AstModifier.insert_sub_ast(module, import_ast, insert_pos, True)
-
-    def _insert_file_path(self):
-        """
-        Insert codes like below to add file search path.
-        >>> import sys
-        >>> sys.path.append(net_path1)
-        >>> sys.path.append(net_path2)
-        >>> ...
-        """
-        module: ast.Module = self._root_tree.get_module_ast()
-        module.body.insert(0, ast.Import([ast.alias(name='sys', asname=None)]))
-        for net_path in self._root_tree.get_net_file_path():
-            sys_path_append_ast = ast.parse(f"sys.path.append(r'{net_path}')").body[0]
-            module.body.insert(1, sys_path_append_ast)

mindspore/rewrite/symbol_tree_dumper.py

@@ -15,7 +15,7 @@
 """SymbolTree dumper."""
 import inspect
 
-from .node import Node
+from .node.node import Node
 from .api.node_type import NodeType
 from .api.scoped_value import ScopedValue, ValueType
 
@@ -69,7 +69,7 @@ class SymbolTreeDumper:
         self._dump_buffer += f"Symbol Tree @construct {{ \n"
         node_no = -1
 
-        node: Node = self._symbol_tree.get_head_node().get_next()
+        node: Node = self._symbol_tree.get_head().get_next()
         while node is not None:
             if node.get_node_type() is NodeType.Output:
                 self._dump_buffer += f"  Return(%{node_no}) \n"

mindspore/run_check/_check_version.py

@@ -259,7 +259,7 @@ class AscendEnvChecker(EnvChecker):
 
     def __init__(self, library_path):
         self.library_path = library_path
-        self.version = ["6.4"]
+        self.version = ["7.0"]
         atlas_nnae_version = "/usr/local/Ascend/nnae/latest/compiler/version.info"
         atlas_toolkit_version = "/usr/local/Ascend/ascend-toolkit/latest/compiler/version.info"
         hisi_fwk_version = "/usr/local/Ascend/latest/compiler/version.info"
@@ -531,7 +531,7 @@ def check_version_and_env_config():
         except OSError:
             logger.warning("Pre-Load Library libgomp.so.1 failed, which might cause TLS memory allocation failure. If "
                            "the failure occurs, please refer to the FAQ for a solution: "
-                           "https://www.mindspore.cn/docs/en/r2.1/faq/installation.html.")
+                           "https://www.mindspore.cn/docs/en/r2.2/faq/installation.html.")
         if not os.getenv("MS_DEV_CLOSE_VERSION_CHECK") is None:
             return
         MSContext.get_instance().register_check_env_callback(check_env)

mindspore/{ops/bprop_mindir → safeguard}/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Huawei Technologies Co., Ltd
+# Copyright 2023 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.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============================================================================
+"""MindSpore Safeguard package."""
+from .rewrite_obfuscation import obfuscate_ckpt, load_obf_params_into_net
 
-"""bprop mindir."""
-from __future__ import absolute_import
+__all__ = ['obfuscate_ckpt', 'load_obf_params_into_net']