From 57e22f58483a4350ebf0d07a2868932503b8ffb2 Mon Sep 17 00:00:00 2001
From: Wilber <jiweibo@baidu.com>
Date: Mon, 28 Nov 2022 20:56:25 +0800
Subject: [PATCH] move  inference api from fluid to paddle (#48368)

---
 python/paddle/fluid/inference/__init__.py     | 33 -------------------
 python/paddle/inference/__init__.py           | 33 +++++++++++--------
 .../paddle/{fluid => }/inference/wrapper.py   |  8 ++---
 python/setup.py.in                            |  1 -
 4 files changed, 23 insertions(+), 52 deletions(-)
 delete mode 100644 python/paddle/fluid/inference/__init__.py
 rename python/paddle/{fluid => }/inference/wrapper.py (92%)

diff --git a/python/paddle/fluid/inference/__init__.py b/python/paddle/fluid/inference/__init__.py
deleted file mode 100644
index 51127de403f..00000000000
--- a/python/paddle/fluid/inference/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#   Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from .wrapper import (
-    Config,
-    DataType,
-    PlaceType,
-    PrecisionType,
-    Tensor,
-    Predictor,
-)
-from .wrapper import convert_to_mixed_precision
-
-from ..core import (
-    create_predictor,
-    get_version,
-    _get_phi_kernel_name,
-    get_num_bytes_of_data_type,
-    PredictorPool,
-    get_trt_compile_version,
-    get_trt_runtime_version,
-)
diff --git a/python/paddle/inference/__init__.py b/python/paddle/inference/__init__.py
index 359f5caccb0..22747d94f2a 100644
--- a/python/paddle/inference/__init__.py
+++ b/python/paddle/inference/__init__.py
@@ -12,20 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ..fluid.inference import Config  # noqa: F401
-from ..fluid.inference import DataType  # noqa: F401
-from ..fluid.inference import PlaceType  # noqa: F401
-from ..fluid.inference import PrecisionType  # noqa: F401
-from ..fluid.inference import Tensor  # noqa: F401
-from ..fluid.inference import Predictor  # noqa: F401
-from ..fluid.inference import create_predictor  # noqa: F401
-from ..fluid.inference import get_version  # noqa: F401
-from ..fluid.inference import _get_phi_kernel_name
-from ..fluid.inference import get_trt_compile_version  # noqa: F401
-from ..fluid.inference import get_trt_runtime_version  # noqa: F401
-from ..fluid.inference import convert_to_mixed_precision  # noqa: F401
-from ..fluid.inference import get_num_bytes_of_data_type  # noqa: F401
-from ..fluid.inference import PredictorPool  # noqa: F401
+from .wrapper import (
+    Config,
+    DataType,
+    PlaceType,
+    PrecisionType,
+    Tensor,
+    Predictor,
+    convert_to_mixed_precision,
+)
+
+from paddle.fluid.core import (
+    create_predictor,
+    get_version,
+    _get_phi_kernel_name,
+    get_trt_compile_version,
+    get_trt_runtime_version,
+    get_num_bytes_of_data_type,
+    PredictorPool,
+)
 
 __all__ = [  # noqa
     'Config',
diff --git a/python/paddle/fluid/inference/wrapper.py b/python/paddle/inference/wrapper.py
similarity index 92%
rename from python/paddle/fluid/inference/wrapper.py
rename to python/paddle/inference/wrapper.py
index ffad69335a4..c69cfa06f39 100644
--- a/python/paddle/fluid/inference/wrapper.py
+++ b/python/paddle/inference/wrapper.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ..core import AnalysisConfig, PaddleDType, PaddlePlace
-from ..core import PaddleInferPredictor, PaddleInferTensor
-from ..core import convert_to_mixed_precision_bind
-from .. import core
+import paddle.fluid.core as core
+from paddle.fluid.core import AnalysisConfig, PaddleDType, PaddlePlace
+from paddle.fluid.core import PaddleInferPredictor, PaddleInferTensor
+from paddle.fluid.core import convert_to_mixed_precision_bind
 
 import os
 import numpy as np
diff --git a/python/setup.py.in b/python/setup.py.in
index 79237c0c238..cab42d8f361 100755
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -330,7 +330,6 @@ packages=['paddle',
           'paddle.inference.contrib',
           'paddle.inference.contrib.utils',
           'paddle.fluid',
-          'paddle.fluid.inference',
           'paddle.fluid.dygraph',
           'paddle.fluid.dygraph.dygraph_to_static',
           'paddle.fluid.dygraph.amp',
-- 
GitLab