소스 검색

update ultra_infer build scripts and dependencies for 3.0rc1 (#3767)

* update build ultra_infer scripts and rollback ultra-infer.python.ultra_infer

* update build scripts and version number

* update TensorRT version

* ort upgrade from 1.12.0 to 1.20.1

* ort upgrade from 1.12.0 to 1.20.1

* update

* fix

* fix

* make pyonly extras_require

* add pyonly extras_require and wheel_name by DEVICE_TYPE env

* fix wheel_name

* add DEVICE_TYPE error message to specify supported values

* use sys.exit
zhang-prog 7 달 전
부모
커밋
17df1d6f7d
100개의 변경된 파일206개의 추가작업 그리고 234개의 파일을 삭제
  1. 1 0
      .pre-commit-config.yaml
  2. 2 2
      libs/ultra-infer/CMakeLists.txt
  3. 1 1
      libs/ultra-infer/VERSION_NUMBER
  4. 2 2
      libs/ultra-infer/cmake/onnxruntime.cmake
  5. 0 10
      libs/ultra-infer/python/requirements.txt
  6. 34 4
      libs/ultra-infer/python/setup.py
  7. 16 18
      libs/ultra-infer/python/ultra_infer/__init__.py
  8. 5 6
      libs/ultra-infer/python/ultra_infer/download.py
  9. 0 1
      libs/ultra-infer/python/ultra_infer/model.py
  10. 0 1
      libs/ultra-infer/python/ultra_infer/pipeline/pptinypose/__init__.py
  11. 1 1
      libs/ultra-infer/python/ultra_infer/py_only/__init__.py
  12. 0 1
      libs/ultra-infer/python/ultra_infer/py_only/ts/model.py
  13. 2 2
      libs/ultra-infer/python/ultra_infer/py_only/ts/processors.py
  14. 1 1
      libs/ultra-infer/python/ultra_infer/py_only/vision/processors.py
  15. 0 3
      libs/ultra-infer/python/ultra_infer/runtime.py
  16. 2 1
      libs/ultra-infer/python/ultra_infer/text/__init__.py
  17. 3 1
      libs/ultra-infer/python/ultra_infer/ts/__init__.py
  18. 5 6
      libs/ultra-infer/python/ultra_infer/ts/anomalydetection/ppts/__init__.py
  19. 3 4
      libs/ultra-infer/python/ultra_infer/ts/classification/ppts/__init__.py
  20. 5 6
      libs/ultra-infer/python/ultra_infer/ts/forecasting/ppts/__init__.py
  21. 1 2
      libs/ultra-infer/python/ultra_infer/utils/hub_config.py
  22. 1 2
      libs/ultra-infer/python/ultra_infer/utils/hub_model_server.py
  23. 1 1
      libs/ultra-infer/python/ultra_infer/vision/__init__.py
  24. 5 7
      libs/ultra-infer/python/ultra_infer/vision/classification/__init__.py
  25. 1 1
      libs/ultra-infer/python/ultra_infer/vision/classification/contrib/resnet.py
  26. 1 1
      libs/ultra-infer/python/ultra_infer/vision/classification/contrib/yolov5cls.py
  27. 3 4
      libs/ultra-infer/python/ultra_infer/vision/classification/ppcls/__init__.py
  28. 1 3
      libs/ultra-infer/python/ultra_infer/vision/classification/ppshitu/__init__.py
  29. 2 1
      libs/ultra-infer/python/ultra_infer/vision/common/__init__.py
  30. 0 2
      libs/ultra-infer/python/ultra_infer/vision/common/manager.py
  31. 0 1
      libs/ultra-infer/python/ultra_infer/vision/common/processors.py
  32. 8 9
      libs/ultra-infer/python/ultra_infer/vision/detection/__init__.py
  33. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/fastestdet.py
  34. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/nanodet_plus.py
  35. 0 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/rkyolo/__init__.py
  36. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/rkyolo/rkyolov5.py
  37. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/scaled_yolov4.py
  38. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolor.py
  39. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov5.py
  40. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov5lite.py
  41. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov5seg.py
  42. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov6.py
  43. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov7.py
  44. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov7end2end_ort.py
  45. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov7end2end_trt.py
  46. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov8.py
  47. 1 1
      libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolox.py
  48. 2 4
      libs/ultra-infer/python/ultra_infer/vision/detection/ppdet/__init__.py
  49. 0 1
      libs/ultra-infer/python/ultra_infer/vision/evaluation/__init__.py
  50. 4 6
      libs/ultra-infer/python/ultra_infer/vision/evaluation/classify.py
  51. 4 5
      libs/ultra-infer/python/ultra_infer/vision/evaluation/detection.py
  52. 5 6
      libs/ultra-infer/python/ultra_infer/vision/evaluation/segmentation.py
  53. 5 5
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/__init__.py
  54. 1 2
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/cityscapes.py
  55. 1 4
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/coco.py
  56. 4 3
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/coco_metrics.py
  57. 9 10
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/coco_utils.py
  58. 1 2
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/fd_logging.py
  59. 1 1
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/json_results.py
  60. 0 1
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/map_utils.py
  61. 1 1
      libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/util.py
  62. 1 2
      libs/ultra-infer/python/ultra_infer/vision/facealign/__init__.py
  63. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facealign/contrib/face_landmark_1000.py
  64. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facealign/contrib/pfld.py
  65. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facealign/contrib/pipnet.py
  66. 3 4
      libs/ultra-infer/python/ultra_infer/vision/facedet/__init__.py
  67. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/blazeface.py
  68. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/centerface.py
  69. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/retinaface.py
  70. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/scrfd.py
  71. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/ultraface.py
  72. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/yolov5face.py
  73. 1 1
      libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/yolov7face.py
  74. 0 1
      libs/ultra-infer/python/ultra_infer/vision/faceid/__init__.py
  75. 1 2
      libs/ultra-infer/python/ultra_infer/vision/faceid/contrib/__init__.py
  76. 1 2
      libs/ultra-infer/python/ultra_infer/vision/faceid/contrib/adaface/__init__.py
  77. 1 2
      libs/ultra-infer/python/ultra_infer/vision/faceid/contrib/insightface/__init__.py
  78. 0 1
      libs/ultra-infer/python/ultra_infer/vision/generation/__init__.py
  79. 1 1
      libs/ultra-infer/python/ultra_infer/vision/generation/contrib/anemigan.py
  80. 0 1
      libs/ultra-infer/python/ultra_infer/vision/headpose/__init__.py
  81. 1 1
      libs/ultra-infer/python/ultra_infer/vision/headpose/contrib/fsanet.py
  82. 0 1
      libs/ultra-infer/python/ultra_infer/vision/keypointdetection/__init__.py
  83. 1 3
      libs/ultra-infer/python/ultra_infer/vision/keypointdetection/pptinypose/__init__.py
  84. 0 1
      libs/ultra-infer/python/ultra_infer/vision/matting/__init__.py
  85. 1 1
      libs/ultra-infer/python/ultra_infer/vision/matting/contrib/modnet.py
  86. 1 1
      libs/ultra-infer/python/ultra_infer/vision/matting/contrib/rvm.py
  87. 1 3
      libs/ultra-infer/python/ultra_infer/vision/matting/ppmatting/__init__.py
  88. 1 1
      libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/__init__.py
  89. 4 1
      libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/utils/ser_vi_layoutxlm/operators.py
  90. 0 3
      libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/utils/ser_vi_layoutxlm/transforms.py
  91. 7 4
      libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/utils/ser_vi_layoutxlm/vqa_utils.py
  92. 3 4
      libs/ultra-infer/python/ultra_infer/vision/perception/__init__.py
  93. 1 1
      libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/caddn.py
  94. 1 1
      libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/centerpoint.py
  95. 1 1
      libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/petr.py
  96. 1 1
      libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/smoke.py
  97. 3 4
      libs/ultra-infer/python/ultra_infer/vision/segmentation/ppseg/__init__.py
  98. 1 2
      libs/ultra-infer/python/ultra_infer/vision/sr/__init__.py
  99. 1 2
      libs/ultra-infer/python/ultra_infer/vision/sr/ppsr/__init__.py
  100. 0 1
      libs/ultra-infer/python/ultra_infer/vision/tracking/__init__.py

+ 1 - 0
.pre-commit-config.yaml

@@ -51,6 +51,7 @@ repos:
     -   id: isort
         args:
             - --profile=black
+        exclude: ^libs/ultra-infer/python/ultra_infer/
 
 # check license
 -   repo: local

+ 2 - 2
libs/ultra-infer/CMakeLists.txt

@@ -36,10 +36,10 @@ set(THIRD_PARTY_DIR ${PROJECT_SOURCE_DIR}/third_party)
 add_subdirectory(${CSRCS_DIR_NAME}/ultra_infer)
 include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
 
-# Set C++11 as standard for the whole project
+# Set C++17 as standard for the whole project
 if(NOT MSVC)
   if(NOT DEFINED CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 17)
   endif()
   set(CMAKE_CXX_FLAGS "-Wno-format -g0 -O3")
   if(NEED_ABI0)

+ 1 - 1
libs/ultra-infer/VERSION_NUMBER

@@ -1 +1 @@
-1.0.0
+1.1.0

+ 2 - 2
libs/ultra-infer/cmake/onnxruntime.cmake

@@ -41,8 +41,8 @@ else()
 endif()
 set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH}" "${ONNXRUNTIME_LIB_DIR}")
 
-set(ONNXRUNTIME_VERSION "1.12.0")
-set(ONNXRUNTIME_URL_PREFIX "https://bj.bcebos.com/paddle2onnx/libs/")
+set(ONNXRUNTIME_VERSION "1.20.1")
+set(ONNXRUNTIME_URL_PREFIX "https://fastdeploy.bj.bcebos.com/third_libs/")
 
 if(WIN32) 
   if(WITH_GPU)

+ 0 - 10
libs/ultra-infer/python/requirements.txt

@@ -4,13 +4,3 @@ tqdm
 numpy<2
 # Compatible with paddlex
 opencv-contrib-python
-pyyaml
-pillow<10.0.0
-pandas>=0.25.0,<=1.3.5
-pycocotools
-matplotlib
-chinese_calendar
-joblib
-scikit-image
-scikit-learn>=1.3.2
-tokenizers

+ 34 - 4
libs/ultra-infer/python/setup.py

@@ -83,6 +83,7 @@ setup_configs["WITH_DIRECTML"] = os.getenv("WITH_DIRECTML", "OFF")
 setup_configs["WITH_ASCEND"] = os.getenv("WITH_ASCEND", "OFF")
 setup_configs["WITH_KUNLUNXIN"] = os.getenv("WITH_KUNLUNXIN", "OFF")
 setup_configs["RKNN2_TARGET_SOC"] = os.getenv("RKNN2_TARGET_SOC", "")
+setup_configs["DEVICE_TYPE"] = os.getenv("DEVICE_TYPE", "")
 # Custom deps settings
 setup_configs["TRT_DIRECTORY"] = os.getenv("TRT_DIRECTORY", "UNDEFINED")
 setup_configs["CUDA_DIRECTORY"] = os.getenv("CUDA_DIRECTORY", "/usr/local/cuda")
@@ -118,10 +119,22 @@ if setup_configs["RKNN2_TARGET_SOC"] != "" or setup_configs["BUILD_ON_JETSON"] !
     REQUIRED_PACKAGES = REQUIRED_PACKAGES.replace("opencv-contrib-python", "")
 
 if wheel_name == "ultra-infer-python":
-    if setup_configs["WITH_GPU"] == "ON" or setup_configs["BUILD_ON_JETSON"] == "ON":
-        wheel_name = "ultra-infer-gpu-python"
-    elif setup_configs["WITH_IPU"] == "ON":
-        wheel_name = "ultra-infer-ipu-python"
+    device_type = setup_configs["DEVICE_TYPE"]
+    if device_type:
+        if device_type not in ["GPU", "IPU", "NPU"]:
+            sys.exit(
+                f"Invalid DEVICE_TYPE: '{device_type}'. Supported values are: GPU, IPU, NPU. "
+                "Please update the DEVICE_TYPE environment variable accordingly."
+            )
+        wheel_name = f"ultra-infer-{device_type.lower()}-python"
+    else:
+        if (
+            setup_configs["WITH_GPU"] == "ON"
+            or setup_configs["BUILD_ON_JETSON"] == "ON"
+        ):
+            wheel_name = "ultra-infer-gpu-python"
+        elif setup_configs["WITH_IPU"] == "ON":
+            wheel_name = "ultra-infer-ipu-python"
 
 if os.getenv("CMAKE_CXX_COMPILER", None) is not None:
     setup_configs["CMAKE_CXX_COMPILER"] = os.getenv("CMAKE_CXX_COMPILER")
@@ -418,6 +431,23 @@ if sys.version_info[0] == 3:
     extras_require["mypy"] = ["mypy==0.600"]
 
 ################################################################################
+# Pyonly
+################################################################################
+
+extras_require["pyonly"] = [
+    "pyyaml",
+    "pillow<10.0.0",
+    "pandas>=0.25.0,<=1.3.5",
+    "pycocotools",
+    "matplotlib",
+    "chinese_calendar",
+    "joblib",
+    "scikit-image",
+    "scikit-learn>=1.3.2",
+    "tokenizers",
+]
+
+################################################################################
 # Final
 ################################################################################
 

+ 16 - 18
libs/ultra-infer/python/ultra_infer/__init__.py

@@ -13,11 +13,10 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 import logging
 import os
-import platform
 import sys
+import platform
 
 # Create a symbol link to tensorrt library.
 trt_directory = os.path.join(
@@ -52,14 +51,8 @@ if os.name != "nt" and os.path.exists(trt_directory):
     for handler in root_logger.handlers[:]:
         root_logger.removeHandler(handler)
 
-from .code_version import (
-    enable_paddle_backend,
-    enable_trt_backend,
-    extra_version_info,
-    git_version,
-    version,
-    with_gpu,
-)
+from .code_version import version, git_version, extra_version_info
+from .code_version import enable_trt_backend, enable_paddle_backend, with_gpu
 
 # Note(zhoushunjie): Fix the import order of paddle and ultra_infer library.
 # This solution will be removed it when the confilct of paddle and
@@ -148,18 +141,19 @@ except:
 
 
 from .c_lib_wrap import (
+    ModelFormat,
     Backend,
-    Device,
     FDDataType,
-    ModelFormat,
     TensorInfo,
-    get_default_cuda_directory,
+    Device,
     is_built_with_gpu,
-    is_built_with_om,
-    is_built_with_openvino,
     is_built_with_ort,
+    ModelFormat,
     is_built_with_paddle,
     is_built_with_trt,
+    get_default_cuda_directory,
+    is_built_with_openvino,
+    is_built_with_om,
 )
 
 
@@ -174,10 +168,14 @@ def set_logger(enable_info=True, enable_warning=True):
     set_logger(enable_info, enable_warning)
 
 
+from .runtime import Runtime, RuntimeOption
+from .model import UltraInferModel
 from . import c_lib_wrap as C
-from . import pipeline, text, ts, vision
+from . import vision
+from . import pipeline
+from . import text
+from . import ts
 from .download import download, download_and_decompress, download_model, get_model_list
-from .model import UltraInferModel
-from .runtime import Runtime, RuntimeOption
+
 
 __version__ = version

+ 5 - 6
libs/ultra-infer/python/ultra_infer/download.py

@@ -12,20 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import hashlib
-import logging
 import os
 import os.path as osp
 import shutil
-import tarfile
+import requests
 import time
 import zipfile
-
-import requests
+import tarfile
+import hashlib
 import tqdm
+import logging
 
-from .utils import hub_env as hubenv
 from .utils.hub_model_server import model_server
+from .utils import hub_env as hubenv
 
 DOWNLOAD_RETRY_LIMIT = 3
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/model.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import absolute_import
-
 import abc
 
 from . import c_lib_wrap as C

+ 0 - 1
libs/ultra-infer/python/ultra_infer/pipeline/pptinypose/__init__.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from ... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/py_only/__init__.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 from . import ts, vision
-from .base import PyOnlyProcessor, PyOnlyProcessorChain, PyOnlyUltraInferModel
+from .base import PyOnlyUltraInferModel, PyOnlyProcessor, PyOnlyProcessorChain

+ 0 - 1
libs/ultra-infer/python/ultra_infer/py_only/ts/model.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import abc
-
 from ..base import PyOnlyUltraInferModel
 
 

+ 2 - 2
libs/ultra-infer/python/ultra_infer/py_only/ts/processors.py

@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Union, Dict
 
 import chinese_calendar
 import joblib
 import numpy as np
 import pandas as pd
+from pandas.tseries.offsets import DateOffset, Easter, Day
 from pandas.tseries import holiday as hd
-from pandas.tseries.offsets import DateOffset, Day, Easter
 from sklearn.preprocessing import StandardScaler
 
 from ..base import PyOnlyProcessor

+ 1 - 1
libs/ultra-infer/python/ultra_infer/py_only/vision/processors.py

@@ -14,8 +14,8 @@
 
 import math
 
-import cv2
 import numpy as np
+import cv2
 from PIL import Image
 
 from ..base import PyOnlyProcessor

+ 0 - 3
libs/ultra-infer/python/ultra_infer/runtime.py

@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import absolute_import
-
 import logging
-
 import numpy as np
-
 from . import ModelFormat
 from . import c_lib_wrap as C
 

+ 2 - 1
libs/ultra-infer/python/ultra_infer/text/__init__.py

@@ -14,4 +14,5 @@
 from __future__ import absolute_import
 
 from . import uie
-from .uie import SchemaLanguage, UIEModel
+from .uie import UIEModel
+from .uie import SchemaLanguage

+ 3 - 1
libs/ultra-infer/python/ultra_infer/ts/__init__.py

@@ -13,4 +13,6 @@
 # limitations under the License.
 from __future__ import absolute_import
 
-from . import anomalydetection, classification, forecasting
+from . import anomalydetection
+from . import classification
+from . import forecasting

+ 5 - 6
libs/ultra-infer/python/ultra_infer/ts/anomalydetection/ppts/__init__.py

@@ -16,17 +16,16 @@ from __future__ import absolute_import
 
 import os
 from copy import deepcopy
-from dataclasses import dataclass
-from typing import List
-
 import numpy as np
 import pandas as pd
+from typing import List
+from dataclasses import dataclass
 
-from .... import ModelFormat, UltraInferModel
-from ....py_only import PyOnlyProcessorChain
+from .... import UltraInferModel, ModelFormat
 from ....py_only.ts import PyOnlyTSModel
-from ....py_only.ts import processors as P
 from ....utils.misc import load_config
+from ....py_only import PyOnlyProcessorChain
+from ....py_only.ts import PyOnlyTSModel, processors as P
 
 
 class PyOnlyAnomalyDetectionModel(PyOnlyTSModel):

+ 3 - 4
libs/ultra-infer/python/ultra_infer/ts/classification/ppts/__init__.py

@@ -16,15 +16,14 @@ from __future__ import absolute_import
 
 import os
 from copy import deepcopy
-from dataclasses import dataclass
-
 import numpy as np
+from dataclasses import dataclass
 
 from .... import ModelFormat
-from ....py_only import PyOnlyProcessorChain
 from ....py_only.ts import PyOnlyTSModel
-from ....py_only.ts import processors as P
 from ....utils.misc import load_config
+from ....py_only import PyOnlyProcessorChain
+from ....py_only.ts import PyOnlyTSModel, processors as P
 
 
 class PyOnlyClassificationModel(PyOnlyTSModel):

+ 5 - 6
libs/ultra-infer/python/ultra_infer/ts/forecasting/ppts/__init__.py

@@ -16,17 +16,16 @@ from __future__ import absolute_import
 
 import os
 from copy import deepcopy
-from dataclasses import dataclass
-from typing import List
-
 import numpy as np
 import pandas as pd
+from typing import List
+from dataclasses import dataclass
 
-from .... import ModelFormat, UltraInferModel
-from ....py_only import PyOnlyProcessorChain
+from .... import UltraInferModel, ModelFormat
 from ....py_only.ts import PyOnlyTSModel
-from ....py_only.ts import processors as P
 from ....utils.misc import load_config
+from ....py_only import PyOnlyProcessorChain
+from ....py_only.ts import PyOnlyTSModel, processors as P
 
 
 class PyOnlyForecastingModel(PyOnlyTSModel):

+ 1 - 2
libs/ultra-infer/python/ultra_infer/utils/hub_config.py

@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import os
-
+import json
 import yaml
 
 from . import hub_env as hubenv

+ 1 - 2
libs/ultra-infer/python/ultra_infer/utils/hub_model_server.py

@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import List
-
 import requests
+from typing import List
 
 from .hub_config import config
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/__init__.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 from __future__ import absolute_import
 
-from .. import C
 from . import (
     classification,
     detection,
@@ -33,6 +32,7 @@ from . import (
 )
 from .utils import fd_result_to_json
 from .visualize import *
+from .. import C
 
 
 def enable_flycv():

+ 5 - 7
libs/ultra-infer/python/ultra_infer/vision/classification/__init__.py

@@ -13,15 +13,13 @@
 # limitations under the License.
 from __future__ import absolute_import
 
-from .contrib.resnet import ResNet
 from .contrib.yolov5cls import YOLOv5Cls
 from .ppcls import *
-from .ppshitu import (
-    PPShiTuV2Detector,
-    PPShiTuV2Recognizer,
-    PPShiTuV2RecognizerPostprocessor,
-    PPShiTuV2RecognizerPreprocessor,
-)
+from .ppshitu import PPShiTuV2Detector
+from .ppshitu import PPShiTuV2Recognizer
+from .ppshitu import PPShiTuV2RecognizerPreprocessor
+from .ppshitu import PPShiTuV2RecognizerPostprocessor
+from .contrib.resnet import ResNet
 
 PPLCNet = PaddleClasModel
 PPLCNetv2 = PaddleClasModel

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/classification/contrib/resnet.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/classification/contrib/yolov5cls.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 3 - 4
libs/ultra-infer/python/ultra_infer/vision/classification/ppcls/__init__.py

@@ -20,13 +20,12 @@ from typing import List
 
 import numpy as np
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
+from ...common import ProcessorManager
 from ....py_only import PyOnlyProcessorChain
-from ....py_only.vision import PyOnlyVisionModel
-from ....py_only.vision import processors as P
+from ....py_only.vision import PyOnlyVisionModel, processors as P
 from ....utils.misc import load_config
-from ...common import ProcessorManager
 
 
 class PaddleClasPreprocessor(ProcessorManager):

+ 1 - 3
libs/ultra-infer/python/ultra_infer/vision/classification/ppshitu/__init__.py

@@ -13,10 +13,8 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 import logging
-
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 from ...common import ProcessorManager
 from ...detection.ppdet import PicoDet

+ 2 - 1
libs/ultra-infer/python/ultra_infer/vision/common/__init__.py

@@ -13,5 +13,6 @@
 # limitations under the License.
 from __future__ import absolute_import
 
-from .manager import ProcessorManager, PyProcessorManager
+from .manager import ProcessorManager
+from .manager import PyProcessorManager
 from .processors import *

+ 0 - 2
libs/ultra-infer/python/ultra_infer/vision/common/manager.py

@@ -13,9 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from abc import ABC, abstractmethod
-
 from ... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/common/processors.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from ... import c_lib_wrap as C
 
 

+ 8 - 9
libs/ultra-infer/python/ultra_infer/vision/detection/__init__.py

@@ -13,19 +13,18 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from .contrib.fastestdet import *
-from .contrib.nanodet_plus import NanoDetPlus
-from .contrib.rkyolo import *
-from .contrib.scaled_yolov4 import ScaledYOLOv4
+from .contrib.yolov7 import *
 from .contrib.yolor import YOLOR
+from .contrib.scaled_yolov4 import ScaledYOLOv4
+from .contrib.nanodet_plus import NanoDetPlus
+from .contrib.yolox import YOLOX
 from .contrib.yolov5 import *
-from .contrib.yolov5lite import YOLOv5Lite
 from .contrib.yolov5seg import *
+from .contrib.fastestdet import *
+from .contrib.yolov5lite import YOLOv5Lite
 from .contrib.yolov6 import YOLOv6
-from .contrib.yolov7 import *
-from .contrib.yolov7end2end_ort import YOLOv7End2EndORT
 from .contrib.yolov7end2end_trt import YOLOv7End2EndTRT
+from .contrib.yolov7end2end_ort import YOLOv7End2EndORT
 from .contrib.yolov8 import *
-from .contrib.yolox import YOLOX
 from .ppdet import *
+from .contrib.rkyolo import *

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/fastestdet.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/nanodet_plus.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/rkyolo/__init__.py

@@ -13,5 +13,4 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from .rkyolov5 import *

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/rkyolo/rkyolov5.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from ..... import ModelFormat, UltraInferModel
+from ..... import UltraInferModel, ModelFormat
 from ..... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/scaled_yolov4.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolor.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov5.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov5lite.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov5seg.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov6.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov7.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov7end2end_ort.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov7end2end_trt.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolov8.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/detection/contrib/yolox.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 2 - 4
libs/ultra-infer/python/ultra_infer/vision/detection/ppdet/__init__.py

@@ -13,11 +13,9 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
+from typing import Union, List
 import logging
-from typing import List, Union
-
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 from ...common import ProcessorManager
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/evaluation/__init__.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import absolute_import
-
 from .classify import eval_classify
 from .detection import eval_detection
 from .segmentation import eval_segmentation

+ 4 - 6
libs/ultra-infer/python/ultra_infer/vision/evaluation/classify.py

@@ -11,11 +11,10 @@
 # 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.
-import collections
+import numpy as np
 import os
 import time
-
-import numpy as np
+import collections
 
 
 def topk_accuracy(topk_list, label_list):
@@ -25,10 +24,9 @@ def topk_accuracy(topk_list, label_list):
 
 
 def eval_classify(model, image_file_path, label_file_path, topk=5):
-    import math
-
-    import cv2
     from tqdm import trange
+    import cv2
+    import math
 
     result_list = []
     label_list = []

+ 4 - 5
libs/ultra-infer/python/ultra_infer/vision/evaluation/detection.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import collections
 import copy
+import collections
 import math
 
 
@@ -26,12 +26,11 @@ def eval_detection(
     plot=False,
     batch_size=1,
 ):
-    import time
-
+    from .utils import CocoDetection
+    from .utils import COCOMetric
     import cv2
     from tqdm import trange
-
-    from .utils import CocoDetection, COCOMetric
+    import time
 
     if conf_threshold is not None or nms_iou_threshold is not None:
         assert (

+ 5 - 6
libs/ultra-infer/python/ultra_infer/vision/evaluation/segmentation.py

@@ -12,19 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from tqdm import trange
+import numpy as np
 import collections
-import math
 import os
+import math
 import time
 
-import numpy as np
-from tqdm import trange
-
 
 def eval_segmentation(model, data_dir, batch_size=1):
     import cv2
-
-    from .utils import Cityscapes, accuracy, calculate_area, f1_score, kappa, mean_iou
+    from .utils import Cityscapes
+    from .utils import f1_score, calculate_area, mean_iou, accuracy, kappa
 
     assert os.path.isdir(data_dir), "The image_file_path:{} is not a directory.".format(
         data_dir

+ 5 - 5
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/__init__.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 from . import fd_logging
-from .cityscapes import *
-from .coco import *
+from .util import *
 from .coco_metrics import *
-from .coco_utils import *
+from .seg_metrics import *
 from .json_results import *
 from .map_utils import *
-from .seg_metrics import *
-from .util import *
+from .coco_utils import *
+from .coco import *
+from .cityscapes import *

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/cityscapes.py

@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import glob
 import os
-
+import glob
 from . import fd_logging as logging
 
 # import fd_logging as logging

+ 1 - 4
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/coco.py

@@ -13,13 +13,10 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 import os.path as osp
-
 import numpy as np
-
 from . import fd_logging as logging
-from .util import get_num_workers, is_pic
+from .util import is_pic, get_num_workers
 
 
 class CocoDetection(object):

+ 4 - 3
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/coco_metrics.py

@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import copy
 import sys
 from collections import OrderedDict
-
-from .coco_utils import cocoapi_eval, get_infer_results
+from .coco_utils import get_infer_results, cocoapi_eval
 
 
 class COCOMetric(object):

+ 9 - 10
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/coco_utils.py

@@ -12,21 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-import copy
 import sys
-
 import numpy as np
-
-from . import fd_logging as logging
+from .map_utils import draw_pr_curve
 from .json_results import (
-    get_det_poly_res,
     get_det_res,
+    get_det_poly_res,
     get_seg_res,
     get_solov2_segm_res,
 )
-from .map_utils import draw_pr_curve
+from . import fd_logging as logging
+import copy
 
 
 def loadRes(coco_obj, anns):
@@ -47,10 +47,9 @@ def loadRes(coco_obj, anns):
     import matplotlib
 
     matplotlib.use("Agg")
-    import time
-
-    import pycocotools.mask as maskUtils
     from pycocotools.coco import COCO
+    import pycocotools.mask as maskUtils
+    import time
 
     res = COCO()
     res.dataset["images"] = [img for img in coco_obj.dataset["images"]]

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/fd_logging.py

@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import time
-
+import sys
 from colorama import init
 
 init(autoreset=True)

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/json_results.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import numpy as np
 import six
+import numpy as np
 
 
 def get_det_res(bboxes, bbox_nums, image_id, label_to_cat_id_map, bias=0):

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/map_utils.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 import os
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/evaluation/utils/util.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import multiprocessing as mp
 import platform
+import multiprocessing as mp
 
 
 def is_pic(img_name):

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/facealign/__init__.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from .contrib.face_landmark_1000 import FaceLandmark1000
 from .contrib.pfld import PFLD
 from .contrib.pipnet import PIPNet
+from .contrib.face_landmark_1000 import FaceLandmark1000

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facealign/contrib/face_landmark_1000.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facealign/contrib/pfld.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facealign/contrib/pipnet.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 3 - 4
libs/ultra-infer/python/ultra_infer/vision/facedet/__init__.py

@@ -13,11 +13,10 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from .contrib.blazeface import *
+from .contrib.yolov5face import YOLOv5Face
+from .contrib.yolov7face import *
 from .contrib.centerface import *
+from .contrib.blazeface import *
 from .contrib.retinaface import RetinaFace
 from .contrib.scrfd import SCRFD
 from .contrib.ultraface import UltraFace
-from .contrib.yolov5face import YOLOv5Face
-from .contrib.yolov7face import *

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/blazeface.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/centerface.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/retinaface.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/scrfd.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/ultraface.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/yolov5face.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/facedet/contrib/yolov7face.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/faceid/__init__.py

@@ -13,5 +13,4 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from .contrib import *

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/faceid/contrib/__init__.py

@@ -13,6 +13,5 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from .adaface import *
 from .insightface import *
+from .adaface import *

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/faceid/contrib/adaface/__init__.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from ..... import ModelFormat, UltraInferModel
+from ..... import UltraInferModel, ModelFormat
 from ..... import c_lib_wrap as C
 
 

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/faceid/contrib/insightface/__init__.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from ..... import ModelFormat, UltraInferModel
+from ..... import UltraInferModel, ModelFormat
 from ..... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/generation/__init__.py

@@ -13,5 +13,4 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from .contrib.anemigan import AnimeGAN

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/generation/contrib/anemigan.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/headpose/__init__.py

@@ -13,5 +13,4 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from .contrib.fsanet import FSANet

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/headpose/contrib/fsanet.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/keypointdetection/__init__.py

@@ -13,5 +13,4 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from .pptinypose import PPTinyPose

+ 1 - 3
libs/ultra-infer/python/ultra_infer/vision/keypointdetection/pptinypose/__init__.py

@@ -13,10 +13,8 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 import logging
-
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/matting/__init__.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 from .contrib.modnet import MODNet
 from .contrib.rvm import RobustVideoMatting
 from .ppmatting import PPMatting

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/matting/contrib/modnet.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/matting/contrib/rvm.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 3
libs/ultra-infer/python/ultra_infer/vision/matting/ppmatting/__init__.py

@@ -13,10 +13,8 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
 import logging
-
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/__init__.py

@@ -30,9 +30,9 @@ from ....py_only.vision import PyOnlyVisionModel
 from ....py_only.vision import processors as P
 from ....utils.misc import load_config
 from ...common import ProcessorManager
-from .utils.ser_vi_layoutxlm.operators import *
 from .utils.ser_vi_layoutxlm.transforms import *
 from .utils.ser_vi_layoutxlm.vqa_utils import *
+from .utils.ser_vi_layoutxlm.operators import *
 
 
 def sort_boxes(boxes):

+ 4 - 1
libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/utils/ser_vi_layoutxlm/operators.py

@@ -13,7 +13,10 @@
 # limitations under the License.
 
 
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import cv2
 import numpy as np

+ 0 - 3
libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/utils/ser_vi_layoutxlm/transforms.py

@@ -31,9 +31,6 @@ def create_operators(op_param_list, global_config=None):
     Args:
         params(list): a dict list, used to create some operators
     """
-    from .operators import *
-    from .vqa_utils import *
-
     assert isinstance(op_param_list, list), "operator config should be a list"
     ops = []
     for operator in op_param_list:

+ 7 - 4
libs/ultra-infer/python/ultra_infer/vision/ocr/ppocr/utils/ser_vi_layoutxlm/vqa_utils.py

@@ -12,14 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import division, print_function, unicode_literals
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import copy
+import numpy as np
 import json
-from collections import defaultdict
+import copy
 from copy import deepcopy
 
-import numpy as np
+from collections import defaultdict
 
 
 def order_by_tbyx(ocr_info):
@@ -75,9 +78,9 @@ class VQATokenLabelEncode(object):
     ):
         super(VQATokenLabelEncode, self).__init__()
         from paddlenlp.transformers import (
+            LayoutXLMTokenizer,
             LayoutLMTokenizer,
             LayoutLMv2Tokenizer,
-            LayoutXLMTokenizer,
         )
 
         tokenizer_dict = {

+ 3 - 4
libs/ultra-infer/python/ultra_infer/vision/perception/__init__.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from .paddle3d.caddn import *
-from .paddle3d.centerpoint import *
-from .paddle3d.petr import *
 from .paddle3d.smoke import *
+from .paddle3d.petr import *
+from .paddle3d.centerpoint import *
+from .paddle3d.caddn import *

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/caddn.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/centerpoint.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/petr.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 1 - 1
libs/ultra-infer/python/ultra_infer/vision/perception/paddle3d/smoke.py

@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 3 - 4
libs/ultra-infer/python/ultra_infer/vision/segmentation/ppseg/__init__.py

@@ -21,13 +21,12 @@ from typing import List
 import numpy as np
 from skimage import morphology
 
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
+from ...common import ProcessorManager
 from ....py_only import PyOnlyProcessorChain
-from ....py_only.vision import PyOnlyVisionModel
-from ....py_only.vision import processors as P
+from ....py_only.vision import PyOnlyVisionModel, processors as P
 from ....utils.misc import load_config
-from ...common import ProcessorManager
 
 
 class PaddleSegModel(UltraInferModel):

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/sr/__init__.py

@@ -12,5 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import absolute_import
-
-from .ppsr import EDVR, PPMSVSR, BasicVSR
+from .ppsr import PPMSVSR, EDVR, BasicVSR

+ 1 - 2
libs/ultra-infer/python/ultra_infer/vision/sr/ppsr/__init__.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-
-from .... import ModelFormat, UltraInferModel
+from .... import UltraInferModel, ModelFormat
 from .... import c_lib_wrap as C
 
 

+ 0 - 1
libs/ultra-infer/python/ultra_infer/vision/tracking/__init__.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import absolute_import
-
 from ... import c_lib_wrap as C
 from .pptracking import PPTracking
 

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.