同步VSR对于hardware_accelerator带来的改进

Author: eritpchy

backend/main.py

@@ -45,12 +45,12 @@ def __init__(self):
         from paddleocr.tools.infer import utility
         from paddleocr.tools.infer.predict_det import TextDetector
         hardware_accelerator = HardwareAccelerator.instance()
-        onnx_providers = hardware_accelerator.get_onnx_providers()
+        onnx_providers = hardware_accelerator.onnx_providers
         model_config = PaddleModelConfig(hardware_accelerator)
         args = utility.parse_args()
         args.det_algorithm = 'DB'
         args.det_model_dir = model_config.convertToOnnxModelIfNeeded(model_config.DET_MODEL_PATH)
-        args.use_gpu=hardware_accelerator.has_gpu(),
+        args.use_gpu=hardware_accelerator.has_cuda()
         args.use_onnx=len(onnx_providers) > 0
         args.onnx_providers=onnx_providers
         self.text_detector = TextDetector(args)
@@ -135,7 +135,7 @@ def run(self):
         self.append_output(f"{tr['Main']['RecMode']}：{config.mode.value}")
         # 如果使用GPU加速，则打印GPU加速提示
         if self.hardware_accelerator.has_accelerator():
-            self.append_output(tr['Main']['AcceleratorON'].format(self.hardware_accelerator.get_accelerator_name()))
+            self.append_output(tr['Main']['AcceleratorON'].format(self.hardware_accelerator.accelerator_name))
 
         # 打印视频帧数与帧率
         self.append_output(f"{tr['Main']['FrameCount']}：{self.frame_count}"
@@ -483,7 +483,7 @@ def vsf_output(out, ):
         left_end = self.sub_area[2] / self.frame_width
         # re：图像右半部分所占百分比，取值【0-1】
         right_end = self.sub_area[3] / self.frame_width
-        if (not self.hardware_accelerator.has_gpu()) and len(self.hardware_accelerator.get_onnx_providers()) > 0:
+        if (not self.hardware_accelerator.has_cuda()) and len(self.hardware_accelerator.onnx_providers) > 0:
             cpu_count = multiprocessing.cpu_count()
         else:
             # 留2核心来给其他任务使用

backend/tools/hardware_accelerator.py

@@ -15,7 +15,7 @@ def instance(cls):
         return cls._instance
 
     def __init__(self):
-        self.__gpu = False
+        self.__cuda = False
         self.__onnx_providers = []
         self.__enabled = True
 
@@ -29,10 +29,10 @@ def check_paddle(self):
         # 查看是否有可用的gpu
             if len(paddle.static.cuda_places()) > 0:
                 # 如果有GPU则使用GPU
-                self.__gpu = True
+                self.__cuda = True
 
     def check_onnx(self):
-        if self.__gpu:
+        if self.__cuda:
             return
         try:
             import onnxruntime as ort
@@ -62,27 +62,29 @@ def check_onnx(self):
     def has_accelerator(self):
         if not self.__enabled:
             return False
-        return self.__gpu or len(self.__onnx_providers) > 0
+        return self.__cuda or len(self.__onnx_providers) > 0
 
-    def get_accelerator_name(self):
+    @property
+    def accelerator_name(self):
         if not self.__enabled:
             return "CPU"
-        if self.__gpu:
+        if self.__cuda:
             return "GPU"
         elif len(self.__onnx_providers) > 0:
             return ", ".join(self.__onnx_providers)
         else:
             return "CPU"
 
-    def get_onnx_providers(self):
+    @property
+    def onnx_providers(self):
         if not self.__enabled:
             return []
         return self.__onnx_providers
 
-    def has_gpu(self):
+    def has_cuda(self):
         if not self.__enabled:
             return False
-        return self.__gpu
+        return self.__cuda
 
     def set_enabled(self, enable):
         self.__enabled = enable

backend/tools/ocr.py

@@ -87,9 +87,9 @@ def predict(self, image):
 
     def init_model(self):
         model_config = PaddleModelConfig(self.hardware_accelerator)
-        onnx_providers = self.hardware_accelerator.get_onnx_providers()
+        onnx_providers = self.hardware_accelerator.onnx_providers
         return PaddleOCR(
-            use_gpu=self.hardware_accelerator.has_gpu(),
+            use_gpu=self.hardware_accelerator.has_cuda(),
             gpu_mem=500,
             det_algorithm='DB',
             # 设置文本检测模型路径

backend/tools/paddle_model_config.py

@@ -108,7 +108,7 @@ def __init__(self, hardware_accelerator):
     def convertToOnnxModelIfNeeded(self, model_dir, model_filename="inference.pdmodel", params_filename="inference.pdiparams", opset_version=14):
         """Converts a Paddle model to ONNX if ONNX providers are available and the model does not already exist."""
 
-        if not self.hardware_accelerator.get_onnx_providers():
+        if not self.hardware_accelerator.onnx_providers:
             return model_dir
 
         onnx_model_path = os.path.join(model_dir, "model.onnx")