apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-07 09:31:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Bug Fix] fix extra version info error (#1959)

Browse Source
This commit is contained in:
DefTruth
2023-05-18 13:25:04 +08:00
committed by GitHub
parent b080b90f80
commit 04ef882ee1
1 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
python/fastdeploy/__init__.py
View File

@@ -43,7 +43,6 @@ if os.name != "nt" and os.path.exists(trt_directory):
break break
logging.basicConfig(level=logging.NOTSET) logging.basicConfig(level=logging.NOTSET)
from .code_version import version, git_version, extra_version_info from .code_version import version, git_version, extra_version_info
from .code_version import enable_trt_backend, enable_paddle_backend, with_gpu from .code_version import enable_trt_backend, enable_paddle_backend, with_gpu
@@ -59,19 +58,19 @@ def get_paddle_version():
paddle_version = "" paddle_version = ""
try: try:
import pkg_resources import pkg_resources
paddle_version = pkg_resources.require( paddle_version = pkg_resources.require("paddlepaddle-gpu")[
"paddlepaddle-gpu")[0].version.split(".post")[0] 0].version.split(".post")[0]
except: except:
try: try:
paddle_version = pkg_resources.require( paddle_version = pkg_resources.require("paddlepaddle")[
"paddlepaddle")[0].version.split(".post")[0] 0].version.split(".post")[0]
except: except:
pass pass
return paddle_version return paddle_version
def should_import_paddle(): def should_import_paddle():
if "paddle2.4" in extra_version_info: if ("paddle2.4" in extra_version_info) or ("post24" in extra_version_info):
paddle_version = get_paddle_version() paddle_version = get_paddle_version()
if paddle_version != "" and paddle_version <= '2.4.2' and paddle_version != "0.0.0": if paddle_version != "" and paddle_version <= '2.4.2' and paddle_version != "0.0.0":
return True return True
@@ -110,15 +109,16 @@ try:
logging.info( logging.info(
"\n[WARNING] Can not find TensorRT lib in LD_LIBRARY_PATH for FastDeploy! \ "\n[WARNING] Can not find TensorRT lib in LD_LIBRARY_PATH for FastDeploy! \
\n[WARNING] Please export [ YOUR CUSTOM TensorRT ] lib path to LD_LIBRARY_PATH first, or run the command: \ \n[WARNING] Please export [ YOUR CUSTOM TensorRT ] lib path to LD_LIBRARY_PATH first, or run the command: \
\n[WARNING] Linux: 'export LD_LIBRARY_PATH=$(python -c 'from fastdeploy import trt_directory; print(trt_directory)'):$LD_LIBRARY_PATH'") \n[WARNING] Linux: 'export LD_LIBRARY_PATH=$(python -c 'from fastdeploy import trt_directory; print(trt_directory)'):$LD_LIBRARY_PATH'"
)
else: else:
logging.info( logging.info(
"\n[WARNING] Can not find TensorRT lib in LD_LIBRARY_PATH for FastDeploy! \ "\n[WARNING] Can not find TensorRT lib in LD_LIBRARY_PATH for FastDeploy! \
\n[WARNING] Please export [YOUR CUSTOM TensorRT] lib path to LD_LIBRARY_PATH first.") \n[WARNING] Please export [YOUR CUSTOM TensorRT] lib path to LD_LIBRARY_PATH first."
)
except: except:
pass pass
from .c_lib_wrap import ( from .c_lib_wrap import (
ModelFormat, ModelFormat,
Backend, Backend,