[Fluid Clean] Migrate program_translate.py/jit.py into paddle.jit dir (…

…#48240)

* [Fluid Clean] Migrate program_translate.py/jit.py into paddle.jit dir

.gitignore

@@ -75,6 +75,7 @@ paddle/fluid/operators/generated_op.cc
 paddle/fluid/operators/generated_sparse_op.cc
 paddle/phi/ops/compat/generated_sig.cc
 paddle/phi/ops/compat/generated_sparse_sig.cc
+paddle/phi/api/yaml/parsed_apis/
 paddle/fluid/operators/generator/parsed_ops/
 paddle/fluid/pybind/tmp_eager_op_function_impl.h
 paddle/fluid/pybind/eager_op_function_impl.h

python/paddle/distributed/auto_parallel/helper.py

@@ -20,7 +20,7 @@
 from paddle.fluid.framework import Parameter
 from paddle.fluid.framework import program_guard
 from paddle.fluid.executor import global_scope
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
+from paddle.jit.dy2static.program_translator import (
     StaticFunction,
 )
 

python/paddle/fluid/compiler.py

@@ -691,16 +691,12 @@ def patch_program_cache(ipu_strategy):
         Returns:
             None
         """
-        from ..fluid.dygraph.dygraph_to_static.program_translator import (
-            ProgramCache,
-        )
-        from ..fluid.dygraph.dygraph_to_static.program_translator import (
+        from paddle.jit.dy2static.program_translator import (
             CacheKey,
-        )
-        from ..fluid.dygraph.dygraph_to_static import logging_utils
-        from ..fluid.dygraph.dygraph_to_static.program_translator import (
+            ProgramCache,
             MAX_TRACED_PROGRAM_COUNT,
         )
+        from ..fluid.dygraph.dygraph_to_static import logging_utils
         from ..fluid.dygraph.dygraph_to_static.partial_program import (
             partial_program_from,
         )

python/paddle/fluid/dygraph/__init__.py

@@ -36,8 +36,6 @@
 from . import learning_rate_scheduler
 from .learning_rate_scheduler import *
 
-from . import jit
-from .jit import *
 
 from . import io
 from .io import *
@@ -46,7 +44,6 @@
 from .static_runner import StaticModelRunner
 
 from . import dygraph_to_static
-from .dygraph_to_static import ProgramTranslator
 
 from . import rnn
 from .rnn import *
@@ -66,8 +63,6 @@
 __all__ += parallel.__all__
 __all__ += checkpoint.__all__
 __all__ += learning_rate_scheduler.__all__
-__all__ += jit.__all__
 __all__ += io.__all__
 __all__ += rnn.__all__
-__all__ += ['ProgramTranslator']
 __all__ += amp.__all__

python/paddle/fluid/dygraph/checkpoint.py

@@ -31,7 +31,7 @@
 import warnings
 from .. import core
 from .base import guard
-from paddle.fluid.dygraph.jit import _SaveLoadConfig
+from paddle.jit.api import _SaveLoadConfig
 from paddle.fluid.dygraph.io import (
     _construct_program_holders,
     _construct_params_and_buffers,

python/paddle/fluid/dygraph/dygraph_to_static/__init__.py

@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from . import ast_transformer
-from .ast_transformer import *
-
 from . import static_analysis
 from .static_analysis import *
 
@@ -24,9 +21,6 @@
 from . import variable_trans_func
 from .variable_trans_func import *
 
-from . import program_translator
-from .program_translator import *
-
 from . import convert_call_func
 from .convert_call_func import *
 
@@ -36,10 +30,8 @@
 from .logging_utils import *
 
 __all__ = []
-__all__ += ast_transformer.__all__
 __all__ += loop_transformer.__all__
 __all__ += static_analysis.__all__
 __all__ += variable_trans_func.__all__
-__all__ += program_translator.__all__
 __all__ += convert_call_func.__all__
 __all__ += logging_utils.__all__

python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py

@@ -36,15 +36,7 @@
 from paddle.fluid.dygraph.dygraph_to_static.logging_utils import (
     TranslatorLogger,
 )
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
-    StaticFunction,
-)
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
-    convert_to_static,
-)
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
-    unwrap_decorators,
-)
+
 from paddle.fluid.dygraph.dygraph_to_static.utils import is_paddle_func, unwrap
 from paddle.fluid.dygraph.layers import Layer
 
@@ -185,6 +177,13 @@ def dyfunc(x):
             #  [1. 1. 1.]]
 
     """
+    # NOTE(Aurelius84): Fix it after all files migrating into jit.
+    from paddle.jit.dy2static.program_translator import (
+        convert_to_static,
+        unwrap_decorators,
+        StaticFunction,
+    )
+
     translator_logger.log(
         1, "Convert callable object: convert {}.".format(func)
     )

python/paddle/fluid/dygraph/static_runner.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.fluid.dygraph.jit import _SaveLoadConfig
+from paddle.jit.api import _SaveLoadConfig
 from paddle.fluid.dygraph.io import TranslatedLayer
 
 

python/paddle/fluid/tests/unittests/dygraph_to_static/bert_dygraph_model.py

@@ -15,7 +15,7 @@
 import paddle
 import paddle.fluid as fluid
 from paddle.fluid.dygraph import Embedding, Layer, Linear
-from paddle.fluid.dygraph.jit import declarative
+from paddle.jit.api import declarative
 
 from transformer_dygraph_model import MultiHeadAttention, PrePostProcessLayer
 

python/paddle/fluid/tests/unittests/dygraph_to_static/seq2seq_dygraph_model.py

@@ -20,7 +20,7 @@
 from paddle.fluid import layers
 from paddle.fluid.dygraph import Layer
 from paddle.fluid.dygraph.base import to_variable
-from paddle.fluid.dygraph.jit import declarative
+from paddle.jit.api import declarative
 from paddle.fluid.dygraph.nn import Embedding
 from seq2seq_utils import Seq2SeqModelHyperParams as args
 

python/paddle/fluid/tests/unittests/dygraph_to_static/simnet_dygraph_model.py

@@ -17,7 +17,7 @@
 import paddle.fluid.param_attr as attr
 
 from functools import reduce
-from paddle.fluid.dygraph import declarative
+from paddle.jit.api import declarative
 from paddle.fluid.dygraph import Embedding, Layer, Linear
 from paddle.static import Variable
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_assert.py

@@ -17,8 +17,8 @@
 
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph.dygraph_to_static import ProgramTranslator
-from paddle.fluid.dygraph.jit import declarative
+from paddle.jit import ProgramTranslator
+from paddle.jit.api import declarative
 
 
 @paddle.jit.to_static

python/paddle/fluid/tests/unittests/dygraph_to_static/test_basic_api_transformation.py

@@ -23,7 +23,7 @@
 
 from paddle import to_tensor
 from paddle.fluid.dygraph import to_variable
-from paddle.fluid.dygraph.jit import dygraph_to_static_func
+from paddle.jit.api import dygraph_to_static_func
 from paddle.fluid.dygraph.dygraph_to_static.utils import is_dygraph_api
 
 SEED = 2020

python/paddle/fluid/tests/unittests/dygraph_to_static/test_bert.py

@@ -20,7 +20,7 @@
 
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph.dygraph_to_static import ProgramTranslator
+from paddle.jit import ProgramTranslator
 from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
 
 from bert_dygraph_model import PretrainModelLayer
@@ -118,7 +118,7 @@ def train(self, bert_config, data_reader, to_static):
                 step_idx += 1
                 if step_idx == STEP_NUM:
                     if to_static:
-                        fluid.dygraph.jit.save(bert, self.model_save_prefix)
+                        paddle.jit.save(bert, self.model_save_prefix)
                     else:
                         fluid.dygraph.save_dygraph(
                             bert.state_dict(), self.dy_state_dict_save_path
@@ -194,7 +194,7 @@ def predict_dygraph(self, bert_config, data):
 
     def predict_dygraph_jit(self, data):
         with fluid.dygraph.guard(place):
-            bert = fluid.dygraph.jit.load(self.model_save_prefix)
+            bert = paddle.jit.load(self.model_save_prefix)
             bert.eval()
 
             (

python/paddle/fluid/tests/unittests/dygraph_to_static/test_bmn.py

@@ -22,7 +22,7 @@
 import paddle.fluid as fluid
 from paddle.fluid import ParamAttr
 from paddle.fluid.dygraph import to_variable
-from paddle.fluid.dygraph import ProgramTranslator
+from paddle.jit import ProgramTranslator
 from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
 
 from predictor_utils import PredictorTools
@@ -751,7 +751,7 @@ def train_bmn(self, args, place, to_static):
 
                     if batch_id == args.train_batch_num:
                         if to_static:
-                            fluid.dygraph.jit.save(bmn, self.model_save_prefix)
+                            paddle.jit.save(bmn, self.model_save_prefix)
                         else:
                             fluid.dygraph.save_dygraph(
                                 bmn.state_dict(), self.dy_param_path
@@ -865,7 +865,7 @@ def predict_static(self, data):
 
     def predict_dygraph_jit(self, data):
         with fluid.dygraph.guard(self.place):
-            bmn = fluid.dygraph.jit.load(self.model_save_prefix)
+            bmn = paddle.jit.load(self.model_save_prefix)
             bmn.eval()
 
             x = to_variable(data)

python/paddle/fluid/tests/unittests/dygraph_to_static/test_break_continue.py

@@ -16,8 +16,8 @@
 import numpy as np
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph.jit import declarative
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
+from paddle.jit.api import declarative
+from paddle.jit.dy2static.program_translator import (
     ProgramTranslator,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import Dygraph2StaticException

python/paddle/fluid/tests/unittests/dygraph_to_static/test_cache_program.py

@@ -18,9 +18,9 @@
 import paddle
 import paddle.fluid as fluid
 
-from paddle.fluid.dygraph.jit import declarative
-from paddle.fluid.dygraph.dygraph_to_static import ProgramTranslator
-from paddle.fluid.dygraph.dygraph_to_static import convert_to_static
+from paddle.jit.api import declarative
+from paddle.jit import ProgramTranslator
+from paddle.jit.dy2static import convert_to_static
 
 from test_fetch_feed import Pool2D, Linear
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_cast.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 import paddle.fluid as fluid
-from paddle.fluid.dygraph import declarative
+from paddle.jit.api import declarative
 
 SEED = 2020
 np.random.seed(SEED)

python/paddle/fluid/tests/unittests/dygraph_to_static/test_convert_call.py

@@ -19,7 +19,7 @@
 
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph import ProgramTranslator
+from paddle.jit import ProgramTranslator
 from paddle.fluid.dygraph.dygraph_to_static.convert_call_func import (
     CONVERSION_OPTIONS,
 )

python/paddle/fluid/tests/unittests/dygraph_to_static/test_cycle_gan.py

@@ -36,7 +36,9 @@
 
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph import to_variable, declarative, ProgramTranslator
+from paddle.fluid.dygraph import to_variable
+from paddle.jit.api import declarative
+from paddle.jit import ProgramTranslator
 from paddle.fluid.dygraph.nn import Conv2DTranspose, BatchNorm
 
 # Note: Set True to eliminate randomness.

python/paddle/fluid/tests/unittests/dygraph_to_static/test_declarative.py

@@ -21,12 +21,11 @@
 from paddle.static import InputSpec
 from paddle.fluid.dygraph import (
     to_variable,
-    declarative,
-    ProgramTranslator,
     Layer,
-    jit,
 )
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
+from paddle.jit.api import declarative
+from paddle.jit import ProgramTranslator
+from paddle.jit.dy2static.program_translator import (
     ConcreteProgram,
     StaticFunction,
 )
@@ -131,8 +130,8 @@ def test_with_input_spec(self):
 
             # 2. test save load
             net.inner_function(x)
-            jit.save(net, self.model_path)
-            infer_net = fluid.dygraph.jit.load(self.model_path)
+            paddle.jit.save(net, self.model_path)
+            infer_net = paddle.jit.load(self.model_path)
             pred = infer_net(x)
             np.testing.assert_allclose(out.numpy(), pred.numpy(), rtol=1e-05)
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_deepcopy.py

@@ -15,7 +15,7 @@
 import unittest
 import paddle
 import numpy as np
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
+from paddle.jit.dy2static.program_translator import (
     StaticFunction,
 )
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py

@@ -18,7 +18,7 @@
 import paddle
 import paddle.fluid as fluid
 from paddle.jit import to_static
-from paddle.fluid.dygraph.dygraph_to_static.program_translator import (
+from paddle.jit.dy2static.program_translator import (
     ProgramTranslator,
 )
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_fetch_feed.py

@@ -16,8 +16,8 @@
 import unittest
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph.jit import declarative
-from paddle.fluid.dygraph.dygraph_to_static import ProgramTranslator
+from paddle.jit.api import declarative
+from paddle.jit import ProgramTranslator
 
 SEED = 2020
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_for_enumerate.py

@@ -19,7 +19,7 @@
 
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph.dygraph_to_static import ProgramTranslator
+from paddle.jit import ProgramTranslator
 from paddle.static import InputSpec
 
 program_translator = ProgramTranslator()