Merge pull request #16 from feifei-111/jitsave

update
feifei-111 · Jun 27, 2023 · 88e3b32 · 88e3b32
2 parents 7ecbf64 + 5246488
commit 88e3b32
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/python/paddle/jit/dy2static/program_translator.py b/python/paddle/jit/dy2static/program_translator.py
@@ -677,16 +677,13 @@ def __init__(self, function, input_spec=None, **kwargs):
         self.last_call_input_spec = None
 
     def _perform_call(self, *args, **kwargs):
-<<<<<<< HEAD
         args, kwargs = self._function_spec.unified_args_and_kwargs(args, kwargs)
         (
             input_args_with_spec,
             input_kwargs_with_spec,
         ) = self._function_spec.args_to_input_spec(args, kwargs)
         self.last_call_input_spec = input_args_with_spec
 
-=======
->>>>>>> dfef6dc85728412c35f9af3a82ddba2f57713101
         from sot import symbolic_translate
 
         build_strategy = self._kwargs.get("build_strategy", None)
@@ -1898,4 +1895,4 @@ def _to_prim(
         whitelist=whitelist,
         start_idx=start_idx,
         backward_length=backward_length,
-    )
+    )