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

[Bug Fix] fixed paddle inference headers include policy (#1827)

Browse Source 
* Update __init__.py

* [Python] Update python whl setup.py

* [cmake] support fd & paddle inference custom libs on win/linux

* [cmake] support fd & paddle inference custom libs on win/linux

* [Bug Fix] fixed paddle inference headers include policy

* [Bug Fix] fixed paddle inference headers include policy

* [Bug Fix] fixed paddle inference headers include policy
This commit is contained in:
DefTruth
2023-04-19 14:32:51 +08:00
committed by GitHub
parent a509dd8ec1
commit 326715569d
5 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/fastdeploy/__init__.py
View File

@@ -45,6 +45,10 @@ if os.name != "nt" and os.path.exists(trt_directory):
# Note(zhoushunjie): Fix the import order of paddle and fastdeploy library.
# This solution will be removed it when the confilct of paddle and
# fastdeploy is fixed.
try:
import paddle
except:
pass
from .c_lib_wrap import (
ModelFormat,

10
python/setup.py
View File

@@ -86,6 +86,8 @@ setup_configs["OPENCV_DIRECTORY"] = os.getenv("OPENCV_DIRECTORY", "")
setup_configs["ORT_DIRECTORY"] = os.getenv("ORT_DIRECTORY", "")
setup_configs["PADDLEINFERENCE_DIRECTORY"] = os.getenv(
"PADDLEINFERENCE_DIRECTORY", "")
setup_configs["PADDLEINFERENCE_VERSION"] = os.getenv(
"PADDLEINFERENCE_VERSION", "")
setup_configs["RKNN2_TARGET_SOC"] = os.getenv("RKNN2_TARGET_SOC", "")
if setup_configs["RKNN2_TARGET_SOC"] != "" or setup_configs[
@@ -376,6 +378,10 @@ if sys.version_info[0] == 3:
package_data = {PACKAGE_NAME: ["LICENSE", "ThirdPartyNotices.txt"]}
extra_version_info = ""
if setup_configs["PADDLEINFERENCE_VERSION"] != "":
extra_version_info += ("." + setup_configs["PADDLEINFERENCE_VERSION"])
if sys.argv[1] == "install" or sys.argv[1] == "bdist_wheel":
shutil.copy(
os.path.join(TOP_DIR, "ThirdPartyNotices.txt"),
@@ -395,7 +401,7 @@ if sys.argv[1] == "install" or sys.argv[1] == "bdist_wheel":
package_data[PACKAGE_NAME].extend(all_lib_data)
setuptools.setup(
name=wheel_name,
version=VersionInfo.version,
version=VersionInfo.version + extra_version_info,
ext_modules=ext_modules,
description="Deploy Kit Tool For Deeplearning models.",
packages=packages,
@@ -416,7 +422,7 @@ if sys.argv[1] == "install" or sys.argv[1] == "bdist_wheel":
else:
setuptools.setup(
name=wheel_name,
version=VersionInfo.version,
version=VersionInfo.version + extra_version_info,
description="Deploy Kit Tool For Deeplearning models.",
ext_modules=ext_modules,
cmdclass=cmdclass,