[SOT][dynamic shape] rename SymbolicIntVariable to SymbolicVariable (#64499)

zrr1999 · web-flow · commit 7043dfe8a8f5 · 2024-05-22T20:00:27.000+08:00
diff --git a/python/paddle/jit/sot/opcode_translator/executor/function_graph.py b/python/paddle/jit/sot/opcode_translator/executor/function_graph.py
@@ -73,7 +73,7 @@
     NullVariable,
     PaddleLayerVariable,
     ParameterVariable,
-    SymbolicIntVariable,
+    SymbolicVariable,
     TensorVariable,
     VariableBase,
     VariableFactory,
@@ -88,7 +88,7 @@ def convert_to_meta(inputs: Any):
     """
 
     def func(x):
-        if isinstance(x, (TensorVariable, SymbolicIntVariable)):
+        if isinstance(x, (TensorVariable, SymbolicVariable)):
             return x.meta
         if isinstance(x, VariableBase):
             return x.get_py_value()
@@ -103,7 +103,7 @@ def convert_to_symbol(inputs: Any):
     """
 
     def func(x):
-        if isinstance(x, (TensorVariable, SymbolicIntVariable)):
+        if isinstance(x, (TensorVariable, SymbolicVariable)):
             return x.get_symbol()
         if isinstance(x, VariableBase):
             return x.get_py_value()
@@ -118,7 +118,7 @@ def record_symbols(SIR, *args, **kwargs):
     non_params = set()
 
     def fn(value):
-        if isinstance(value, (TensorVariable, SymbolicIntVariable)):
+        if isinstance(value, (TensorVariable, SymbolicVariable)):
             symbol_meta_map[value.get_symbol()] = value.meta
             if isinstance(value, ParameterVariable):
                 params.add(value.get_symbol())
@@ -414,16 +414,16 @@ def start_compile(self, *ret_vars: VariableBase):
             found = False
             for variable in self.input_variables:
                 if (
-                    isinstance(variable, (TensorVariable, SymbolicIntVariable))
+                    isinstance(variable, (TensorVariable, SymbolicVariable))
                     and variable.get_symbol().name == name
                 ):
-                    if isinstance(variable, SymbolicIntVariable):
+                    if isinstance(variable, SymbolicVariable):
                         self.pycode_gen.gen_load_object(
                             paddle.to_tensor, "___paddle_to_tensor"
                         )
                     variable.tracker.gen_instructions(self.pycode_gen)
                     found = True
-                    if isinstance(variable, SymbolicIntVariable):
+                    if isinstance(variable, SymbolicVariable):
                         self.pycode_gen.gen_call_function(1)
                     break
             assert found, f"can't find input {name} in SIR."
@@ -612,7 +612,7 @@ def symbolic_call(
 
         log(3, f"         inputs : {inputs_symbols}", "\n")
 
-        var_cls = SymbolicIntVariable if is_symbolic_int else TensorVariable
+        var_cls = SymbolicVariable if is_symbolic_int else TensorVariable
         outputs = map_if(
             out_metas,
             pred=lambda x: isinstance(x, MetaInfo),
@@ -707,7 +707,7 @@ def remove_global_guarded_variable(self, variable: VariableBase):
 
     def _find_tensor_outputs(
         self, outputs: list[VariableBase]
-    ) -> OrderedSet[TensorVariable | SymbolicIntVariable]:
+    ) -> OrderedSet[TensorVariable | SymbolicVariable]:
         """
         Return all TensorVariable. find TensorVariables participating in networking from the output Variables
 
@@ -717,9 +717,9 @@ def _find_tensor_outputs(
 
         def is_graph_output(
             var,
-        ) -> TypeGuard[TensorVariable | SymbolicIntVariable]:
+        ) -> TypeGuard[TensorVariable | SymbolicVariable]:
             return isinstance(var.tracker, DummyTracker) and isinstance(
-                var, (TensorVariable, SymbolicIntVariable)
+                var, (TensorVariable, SymbolicVariable)
             )
 
         def collect_related_dummy_tensor(var):
@@ -734,7 +734,7 @@ def collect_related_dummy_tensor(var):
             return []
 
         output_tensors: OrderedSet[
-            TensorVariable | SymbolicIntVariable
+            TensorVariable | SymbolicVariable
         ] = OrderedSet()
         # Find Tensor Variables from outputs.
         for output in outputs:
diff --git a/python/paddle/jit/sot/opcode_translator/executor/variable_dispatch.py b/python/paddle/jit/sot/opcode_translator/executor/variable_dispatch.py
@@ -48,7 +48,7 @@
     NumpyVariable,
     RangeVariable,
     SliceVariable,
-    SymbolicIntVariable,
+    SymbolicVariable,
     TupleVariable,
     VariableBase,
     VariableFactory,
@@ -886,7 +886,7 @@ def is_not_func(var: VariableBase, other: VariableBase):
     if unary_fn in fallback_tensor_unary_method:
         Dispatcher.register(
             unary_fn,
-            ("TensorVariable | SymbolicIntVariable",),
+            ("TensorVariable | SymbolicVariable",),
             raise_break_graph_fn,
         )
         continue
@@ -912,7 +912,7 @@ def is_not_func(var: VariableBase, other: VariableBase):
         )
         Dispatcher.register(
             unary_fn,
-            ("SymbolicIntVariable",),
+            ("SymbolicVariable",),
             partial(
                 lambda magic_name, var: var.graph.call_symbolic_method(
                     magic_name, var
@@ -932,7 +932,7 @@ def is_not_func(var: VariableBase, other: VariableBase):
                 binary_fn,
                 (
                     "TensorVariable",
-                    "TensorVariable | SymbolicIntVariable | ConstantVariable | NumpyVariable",
+                    "TensorVariable | SymbolicVariable | ConstantVariable | NumpyVariable",
                 ),
                 partial(
                     lambda magic_name, var, other: var.graph.call_tensor_method(
@@ -944,8 +944,8 @@ def is_not_func(var: VariableBase, other: VariableBase):
             Dispatcher.register(
                 binary_fn,
                 (
-                    "SymbolicIntVariable",
-                    "ConstantVariable | SymbolicIntVariable",
+                    "SymbolicVariable",
+                    "ConstantVariable | SymbolicVariable",
                 ),
                 partial(
                     lambda magic_name, var, other: var.graph.call_symbolic_method(
@@ -960,7 +960,7 @@ def is_not_func(var: VariableBase, other: VariableBase):
 
                 @Dispatcher.register_decorator(operator.mod)
                 def tensor_mod_dispatcher(
-                    var: ConstantVariable | SymbolicIntVariable,
+                    var: ConstantVariable | SymbolicVariable,
                     other: TensorVariable,
                 ):
                     if var.get_py_type() is str:
@@ -973,7 +973,7 @@ def tensor_mod_dispatcher(
                 Dispatcher.register(
                     binary_fn,
                     (
-                        "SymbolicIntVariable | ConstantVariable | NumpyVariable",
+                        "SymbolicVariable | ConstantVariable | NumpyVariable",
                         "TensorVariable",
                     ),
                     partial(
@@ -986,7 +986,7 @@ def tensor_mod_dispatcher(
 
                 Dispatcher.register(
                     binary_fn,
-                    ("ConstantVariable", "SymbolicIntVariable"),
+                    ("ConstantVariable", "SymbolicVariable"),
                     partial(
                         lambda magic_name, var, other: var.graph.call_symbolic_method(
                             magic_name, var, other
diff --git a/python/paddle/jit/sot/opcode_translator/executor/variables/__init__.py b/python/paddle/jit/sot/opcode_translator/executor/variables/__init__.py
@@ -31,7 +31,7 @@
     ObjectVariable,
     ParameterVariable,
     SliceVariable,
-    SymbolicIntVariable,
+    SymbolicVariable,
     TensorVariable,
 )
 from .callable import (  # noqa: F401
diff --git a/python/paddle/jit/sot/opcode_translator/executor/variables/basic.py b/python/paddle/jit/sot/opcode_translator/executor/variables/basic.py
@@ -595,7 +595,7 @@ def from_value(value: Any, graph: FunctionGraph, tracker: Tracker):
         return None
 
 
-class SymbolicIntVariable(VariableBase):
+class SymbolicVariable(VariableBase):
     """
     TODO
     """
@@ -678,7 +678,7 @@ def from_value(value: Any, graph: FunctionGraph, tracker: Tracker):
                 symbolic_input.setdefault(value, 0)
                 symbolic_input[value] += 1
                 # TODO(zrr1999): determine frequency
-                return SymbolicIntVariable(value, graph, tracker)
+                return SymbolicVariable(value, graph, tracker)
         return None
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`ObjectVariable,`
`32`	`32`	`ParameterVariable,`
`33`	`33`	`SliceVariable,`
`34`		`- SymbolicIntVariable,`
	`34`	`+ SymbolicVariable,`
`35`	`35`	`TensorVariable,`
`36`	`36`	`)`
`37`	`37`	`from .callable import ( # noqa: F401`