PaddlePaddle
diff --git a/‎python/paddle/base/framework.py
Copy file name to clipboard
+72Lines changed: 72 additions & 0 deletions b/‎python/paddle/base/framework.py
Copy file name to clipboard
+72Lines changed: 72 additions & 0 deletions
diff --git a/‎python/paddle/distributed/auto_parallel/constants.py
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎python/paddle/distributed/auto_parallel/constants.py
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
@@ -1133,6 +1133,66 @@ def name_scope(prefix=None):
             _name_scope = _name_scope.parent()
 
 
+class NameStruct:
+    def __init__(self, name="", parent=None):
+        self._children = {}
+        self._name = name
+        self._parent = parent
+
+    def child(self, prefix):
+        if prefix not in self._children:
+            new_child = NameStruct(prefix, self)
+            self._children[prefix] = [new_child]
+        else:
+            new_child = NameStruct(
+                prefix + "_%d" % len(self._children[prefix]), self
+            )
+            self._children[prefix].append(new_child)
+        return new_child
+
+    def parent(self):
+        return self._parent
+
+    def name(self):
+        return self._name
+
+
+_name_struct = NameStruct()
+
+
+@signature_safe_contextmanager
+def name_struct(prefix=None):
+    """
+    Note: This should only used in Paddle/python/paddle/nn/layer/layers.py
+    to record the call path for the operators in Static Graph of AutoParallel.
+
+    Args:
+        prefix(str, optional): prefix. Default is none.
+    """
+    # TODO(panyx0718): Only [0-9a-z].
+    # in dygraph we don't need namescope since it will cause mem leak
+    if in_dygraph_mode():
+        yield
+    else:
+        assert prefix, "namescope prefix can not be empty."
+        global _name_struct
+        _name_struct = _name_struct.child(prefix)
+        try:
+            yield
+        finally:
+            _name_struct = _name_struct.parent()
+
+
+def _full_name_struct():
+    global _name_struct
+    struct = _name_struct
+    name = ""
+    while struct:
+        name = struct.name() + "/" + name
+        struct = struct.parent()
+    return name
+
+
 def _full_name_scope():
     global _name_scope
     scope = _name_scope
@@ -2982,6 +3042,9 @@ def __init__(
 
             self._amp_options: AmpOptions = DEFAULT_AMP_OPTIONS
 
+            # record the call path of op, only used in AutoParallel
+            self._struct_name = _full_name_struct()
+
             op_maker = core.op_proto_and_checker_maker
 
             if op_maker.kOpRoleAttrName() not in op_attrs:
@@ -3758,6 +3821,14 @@ def amp_options(self):
         """
         return self._amp_options
 
+    @property
+    def struct_name(self):
+        return self._struct_name
+
+    @struct_name.setter
+    def struct_name(self, struct_name):
+        self._struct_name = struct_name
+
 
 @signature_safe_contextmanager
 def _stride_in_no_check_dy2st_diff():
@@ -7077,6 +7148,7 @@ def _copy_operator_info_from(self, other: Program):
         for dst_block, src_block in zip(self.blocks, other.blocks):
             for dst_op, src_op in zip(dst_block.ops, src_block.ops):
                 dst_op.set_amp_options(src_op.amp_options)
+                dst_op.struct_name = src_op.struct_name
 
     def list_vars(self):
         """
 
@@ -110,6 +110,8 @@ def set_field_default_config(category, field, default_value):
 PIPELINE = "pipeline"
 set_field_default_config(PIPELINE, "enable", False)
 set_field_default_config(PIPELINE, "schedule_mode", "1F1B")
+set_field_default_config(PIPELINE, "vpp_degree", 1)
+set_field_default_config(PIPELINE, "vpp_seg_method", "")
 set_field_default_config(PIPELINE, "micro_batch_size", 1)
 set_field_default_config(PIPELINE, "accumulate_steps", 1)
 set_field_default_config(PIPELINE, "generation_batch_size", 1)