Prechádzať zdrojové kódy

Fix paddle version bug (#3821)

* Fix paddle version bug

* Fix

* Fix bugs
Lin Manhui 7 mesiacov pred
rodič
commit
93569dc824
2 zmenil súbory, kde vykonal 12 pridanie a 5 odobranie
  1. 2 2
      paddlex/inference/utils/hpi.py
  2. 10 3
      paddlex/utils/env.py

+ 2 - 2
paddlex/inference/utils/hpi.py

@@ -142,10 +142,10 @@ def suggest_inference_backend_and_config(
         return None, f"Inference backend {repr(hpi_config.backend)} is unavailable."
 
     paddle_version = get_paddle_version()
-    if paddle_version != (3, 0, 0):
+    if paddle_version != (3, 0, 0, None):
         return (
             None,
-            f"{repr('.'.join(paddle_version))} is not a supported Paddle version.",
+            f"{paddle_version} is not a supported Paddle version.",
         )
 
     if hpi_config.device_type == "cpu":

+ 10 - 3
paddlex/utils/env.py

@@ -23,11 +23,18 @@ def get_device_type():
 def get_paddle_version():
     import paddle
 
-    version = paddle.__version__.split(".")
-    # ref: https://github.com/PaddlePaddle/Paddle/blob/release/3.0-beta2/setup.py#L316
+    version = paddle.__version__
+    if "-" in version:
+        version, tag = version.split("-")
+    else:
+        tag = None
+    version = version.split(".")
     assert len(version) == 3
     major_v, minor_v, patch_v = map(int, version)
-    return major_v, minor_v, patch_v
+    if tag:
+        return major_v, minor_v, patch_v, tag
+    else:
+        return major_v, minor_v, patch_v, None
 
 
 def get_cuda_version():