Fix negtive negative, etc (#62315)

co63oc · web-flow · commit b51d50bc9ee9 · 2024-03-05T10:33:51.000+08:00
* Fix

* ci

* ci

* ci

* Fix
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/paddle_op_infer_sym.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/paddle_op_infer_sym.cc
@@ -218,7 +218,7 @@ inline void CheckAndUpdateSliceAttrs(
                                      "deal with -1 in infer_flags now"));
     }
 
-    // For both start and end can be negtive or positive, we need to handle the
+    // For both start and end can be negative or positive, we need to handle the
     // following different arrangements.
     ends[i] = IsMaxInt(ends[i]) ? in_dims[axis] : ends[i];
 
@@ -333,7 +333,7 @@ bool SliceOpInferSymbolicShape(pir::Operation *op,
   };
 
   // When `pd.slice` is operating on a tensor which is produced by a `pd.shape`
-  // op, the reseult should be written into data.
+  // op, the result should be written into data.
   const auto &GetDataDimExprs = [&]() -> symbol::ShapeOrDataDimExprs {
     std::vector<symbol::DimExpr> out_data;
 
@@ -777,7 +777,7 @@ bool TransposeOpInferSymbolicShape(
                      return p.dyn_cast<pir::Int32Attribute>().data();
                    });
 
-    // format the negtive axis
+    // format the negative axis
     std::for_each(out.begin(), out.end(), [x_rank](int32_t &v) {
       if (v < 0) {
         v += x_rank;
@@ -1082,7 +1082,7 @@ bool SplitOpInferSymbolicShape(pir::Operation *op,
   return true;
 }
 
-//  Not Impelmented Ops.
+//  Not Implemented Ops.
 
 bool DiagEmbedOpInferSymbolicShape(
     pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) {
diff --git a/python/paddle/jit/dy2static/error.py b/python/paddle/jit/dy2static/error.py
@@ -44,7 +44,7 @@
 
 def attach_error_data(error, in_runtime=False):
     """
-    Attachs error data about original source code information and traceback to an error.
+    Attaches error data about original source code information and traceback to an error.
 
     Args:
         error(Exception): An native error.
@@ -157,7 +157,7 @@ def __init__(self):
         # {(keywords): (suggestions)}
         self.suggestion_dict = {
             ('is not initialized.', 'Hint:', 'IsInitialized'): (
-                "Please ensure all your sublayers are inheritted from nn.Layer.",
+                "Please ensure all your sublayers are inherited from nn.Layer.",
                 "Please ensure there is no tensor created explicitly depended on external data, "
                 + "we suggest to register it as buffer tensor. "
                 + "See https://www.paddlepaddle.org.cn/documentation/docs/zh/guides/jit/principle_cn.html#buffers for details",
diff --git a/python/paddle/jit/dy2static/origin_info.py b/python/paddle/jit/dy2static/origin_info.py
@@ -19,7 +19,7 @@
 from paddle.base.framework import Program
 from paddle.utils import gast
 
-from .utils import ORIGI_INFO
+from .utils import ORIGIN_INFO
 
 __all__ = []
 
@@ -130,7 +130,7 @@ def _attach_origin_info(self, node):
         code_line = self.source_lines[node.lineno - 1]
 
         origin_info = OriginInfo(loc, func_name, code_line)
-        setattr(node, ORIGI_INFO, origin_info)
+        setattr(node, ORIGIN_INFO, origin_info)
 
     def _abs_lineno(self, node):
         return self.lineno_offset + node.lineno
@@ -167,8 +167,8 @@ def create_and_update_origin_info_map(
         ), "The node types should be the same, but received type(t_node) is {}, and type(s_node) is {}.".format(
             type(t_node), type(s_node)
         )
-        dygraph_info = getattr(t_node, ORIGI_INFO, None)
-        static_info = getattr(s_node, ORIGI_INFO, None)
+        dygraph_info = getattr(t_node, ORIGIN_INFO, None)
+        static_info = getattr(s_node, ORIGIN_INFO, None)
 
         if dygraph_info is None or static_info is None:
             continue
diff --git a/python/paddle/jit/dy2static/transformers/base.py b/python/paddle/jit/dy2static/transformers/base.py
@@ -14,7 +14,7 @@
 
 from paddle.base import unique_name
 from paddle.jit.dy2static.utils import (
-    ORIGI_INFO,
+    ORIGIN_INFO,
     ast_to_source_code,
 )
 from paddle.utils import gast
@@ -37,7 +37,7 @@ def visit(self, node):
         if not isinstance(node, gast.AST):
             msg = f'Expected "gast.AST", but got "{type(node)}".'
             raise ValueError(msg)
-        origin_info = getattr(node, ORIGI_INFO, None)
+        origin_info = getattr(node, ORIGIN_INFO, None)
 
         result = super().visit(node)
 
@@ -47,7 +47,7 @@ def visit(self, node):
                 iter_result = (iter_result,)
             if origin_info is not None:
                 for n in iter_result:
-                    setattr(n, ORIGI_INFO, origin_info)
+                    setattr(n, ORIGIN_INFO, origin_info)
 
         return result
 
diff --git a/python/paddle/jit/dy2static/transformers/return_transformer.py b/python/paddle/jit/dy2static/transformers/return_transformer.py
@@ -16,7 +16,7 @@
 from paddle.utils import gast
 
 from ..utils import (
-    ORIGI_INFO,
+    ORIGIN_INFO,
     Dygraph2StaticException,
     ast_to_source_code,
 )
@@ -374,8 +374,8 @@ def _replace_return_in_stmt_list(
                     value=return_node.value,
                 )
             )
-            return_origin_info = getattr(return_node, ORIGI_INFO, None)
-            setattr(assign_nodes[-1], ORIGI_INFO, return_origin_info)
+            return_origin_info = getattr(return_node, ORIGIN_INFO, None)
+            setattr(assign_nodes[-1], ORIGIN_INFO, return_origin_info)
 
         # If there is a return in the body or else of if, the remaining statements
         # will not be executed, so they can be properly replaced.
diff --git a/python/paddle/jit/dy2static/utils.py b/python/paddle/jit/dy2static/utils.py
@@ -48,8 +48,8 @@
 
 ALREADY_D2S = '__already_d2s'
 
-# NOTE(liym27): Please use `getattr(ast_node, ORIGI_INFO)` instead of . operation to get the original information of ast node.
-ORIGI_INFO = "Original information of source code for ast node."
+# NOTE(liym27): Please use `getattr(ast_node, ORIGIN_INFO)` instead of . operation to get the original information of ast node.
+ORIGIN_INFO = "Original information of source code for ast node."
 
 DEL_TEMP_DIR = True  # A flag to avoid atexit.register more than once
 
@@ -218,7 +218,7 @@ def make_hashable(x, error_msg=None):
 def as_not_paddle_func(path):
     """
     Append API or class as ignored case for is_paddle_func, and they
-    will be retured False while calling is_paddle_func(func).
+    will be returned False while calling is_paddle_func(func).
     """
     global INNER_FUNC_WHITE_LIST
     AS_NOT_INNER_FUNC_LIST.add(path)
diff --git a/test/dygraph_to_static/test_origin_info.py b/test/dygraph_to_static/test_origin_info.py
@@ -18,7 +18,7 @@
 import paddle
 from paddle.jit.dy2static import DygraphToStaticAst
 from paddle.jit.dy2static.origin_info import (
-    ORIGI_INFO,
+    ORIGIN_INFO,
     Location,
     OriginInfo,
     attach_origin_info,
@@ -139,7 +139,7 @@ def test_attach_origin_info(self):
 
         for i in range(self.line_num):
             node = self.transformed_node_list[i]
-            origin_info = getattr(node, ORIGI_INFO)
+            origin_info = getattr(node, ORIGIN_INFO)
             dy_rel_lineno = self.dy_rel_lineno_list[i]
             dy_abs_lineno = start_lineno + dy_rel_lineno
             dy_col_offset = self.dy_abs_col_offset[i]

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`from paddle.utils import gast`
`17`	`17`
`18`	`18`	`from ..utils import (`
`19`		`- ORIGI_INFO,`
	`19`	`+ ORIGIN_INFO,`
`20`	`20`	`Dygraph2StaticException,`
`21`	`21`	`ast_to_source_code,`
`22`	`22`	`)`
`@@ -374,8 +374,8 @@ def _replace_return_in_stmt_list(`
`374`	`374`	`value=return_node.value,`
`375`	`375`	`)`
`376`	`376`	`)`
`377`		`- return_origin_info = getattr(return_node, ORIGI_INFO, None)`
`378`		`- setattr(assign_nodes[-1], ORIGI_INFO, return_origin_info)`
	`377`	`+ return_origin_info = getattr(return_node, ORIGIN_INFO, None)`
	`378`	`+ setattr(assign_nodes[-1], ORIGIN_INFO, return_origin_info)`
`379`	`379`
`380`	`380`	`# If there is a return in the body or else of if, the remaining statements`
`381`	`381`	`# will not be executed, so they can be properly replaced.`