diff --git a/fastdeploy/__init__.py b/fastdeploy/__init__.py index 17858f7e9a9..f4b085f34fc 100644 --- a/fastdeploy/__init__.py +++ b/fastdeploy/__init__.py @@ -13,12 +13,16 @@ # limitations under the License. from __future__ import absolute_import import logging -from .fastdeploy_main import Frontend, Backend, FDDataType, TensorInfo, Device -from .fastdeploy_runtime import * from . import fastdeploy_main as C +from .fastdeploy_runtime import * from . import vision from .download import download, download_and_decompress +Frontend = C.Frontend +Backend = C.Backend +FDDataType = C.FDDataType +TensorInfo = C.TensorInfo +Device = C.Device def TensorInfoStr(tensor_info): message = "TensorInfo(name : '{}', dtype : '{}', shape : '{}')".format( @@ -103,5 +107,6 @@ def RuntimeOptionStr(runtime_option): message.strip("\n") message += ")" return message + C.TensorInfo.__repr__ = TensorInfoStr C.RuntimeOption.__repr__ = RuntimeOptionStr diff --git a/fastdeploy/fastdeploy_runtime.py b/fastdeploy/fastdeploy_runtime.py index e07e28993bc..0a31bdac5b5 100644 --- a/fastdeploy/fastdeploy_runtime.py +++ b/fastdeploy/fastdeploy_runtime.py @@ -13,7 +13,7 @@ # limitations under the License. from __future__ import absolute_import import logging -from . import fastdeploy_main as C +from . import C class FastDeployModel: diff --git a/fastdeploy/vision/deepcam/__init__.py b/fastdeploy/vision/deepcam/__init__.py index 6b1af4328b5..691497883c5 100644 --- a/fastdeploy/vision/deepcam/__init__.py +++ b/fastdeploy/vision/deepcam/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class YOLOv5Face(FastDeployModel): diff --git a/fastdeploy/vision/megvii/__init__.py b/fastdeploy/vision/megvii/__init__.py index 8f96c974284..d8b8e7a20f5 100644 --- a/fastdeploy/vision/megvii/__init__.py +++ b/fastdeploy/vision/megvii/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class YOLOX(FastDeployModel): diff --git a/fastdeploy/vision/meituan/__init__.py b/fastdeploy/vision/meituan/__init__.py index 7b6635dd368..077c4c099df 100644 --- a/fastdeploy/vision/meituan/__init__.py +++ b/fastdeploy/vision/meituan/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class YOLOv6(FastDeployModel): diff --git a/fastdeploy/vision/ppcls/__init__.py b/fastdeploy/vision/ppcls/__init__.py index 7eb2bd4624f..fa1d541f780 100644 --- a/fastdeploy/vision/ppcls/__init__.py +++ b/fastdeploy/vision/ppcls/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class Model(FastDeployModel): diff --git a/fastdeploy/vision/ppdet/__init__.py b/fastdeploy/vision/ppdet/__init__.py index 661ef0e1fcd..c3090a648db 100644 --- a/fastdeploy/vision/ppdet/__init__.py +++ b/fastdeploy/vision/ppdet/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class PPYOLOE(FastDeployModel): diff --git a/fastdeploy/vision/ppseg/__init__.py b/fastdeploy/vision/ppseg/__init__.py index b580c014556..480f571712f 100644 --- a/fastdeploy/vision/ppseg/__init__.py +++ b/fastdeploy/vision/ppseg/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class Model(FastDeployModel): diff --git a/fastdeploy/vision/rangilyu/__init__.py b/fastdeploy/vision/rangilyu/__init__.py index f2e8ace9fcb..2825db8ba68 100644 --- a/fastdeploy/vision/rangilyu/__init__.py +++ b/fastdeploy/vision/rangilyu/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class NanoDetPlus(FastDeployModel): diff --git a/fastdeploy/vision/ultralytics/__init__.py b/fastdeploy/vision/ultralytics/__init__.py index 4dcd0d6d458..227795354bc 100644 --- a/fastdeploy/vision/ultralytics/__init__.py +++ b/fastdeploy/vision/ultralytics/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import C class YOLOv5(FastDeployModel): diff --git a/fastdeploy/vision/visualize/__init__.py b/fastdeploy/vision/visualize/__init__.py index ea836b68ead..c3e85df9111 100644 --- a/fastdeploy/vision/visualize/__init__.py +++ b/fastdeploy/vision/visualize/__init__.py @@ -14,7 +14,7 @@ from __future__ import absolute_import import logging -from ... import fastdeploy_main as C +from ... import C def vis_detection(im_data, det_result, line_size=1, font_size=0.5): diff --git a/fastdeploy/vision/wongkinyiu/__init__.py b/fastdeploy/vision/wongkinyiu/__init__.py index c1a3d37f7f7..86f0467ef05 100644 --- a/fastdeploy/vision/wongkinyiu/__init__.py +++ b/fastdeploy/vision/wongkinyiu/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import logging from ... import FastDeployModel, Frontend -from ... import fastdeploy_main as C +from ... import as C class YOLOv7(FastDeployModel):