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

Fix build on jetson (#281)

Browse Source 
* Fix compile on Jetson

* trigger ci
This commit is contained in:
Jason
2022-09-26 19:23:30 +08:00
committed by GitHub
parent 85c44d562e
commit 36eb6fbba6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
PROJECT(fastdeploy C CXX) PROJECT(fastdeploy C CXX)
CMAKE_MINIMUM_REQUIRED (VERSION 3.16) CMAKE_MINIMUM_REQUIRED (VERSION 3.10)
option(CSRCS_DIR_NAME "Name of source code directory") option(CSRCS_DIR_NAME "Name of source code directory")
option(LIBRARY_NAME "Name of build library name") option(LIBRARY_NAME "Name of build library name")
@@ -34,6 +34,7 @@ include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
# Set C++11 as standard for the whole project # Set C++11 as standard for the whole project
if(NOT MSVC) if(NOT MSVC)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "-Wno-format")
endif(NOT MSVC) endif(NOT MSVC)
if(ANDROID) if(ANDROID)

2
python/setup.py
View File

@@ -66,7 +66,7 @@ setup_configs["PY_LIBRARY_NAME"] = PACKAGE_NAME + "_main"
setup_configs["OPENCV_DIRECTORY"] = os.getenv("OPENCV_DIRECTORY", "") setup_configs["OPENCV_DIRECTORY"] = os.getenv("OPENCV_DIRECTORY", "")
setup_configs["ORT_DIRECTORY"] = os.getenv("ORT_DIRECTORY", "") setup_configs["ORT_DIRECTORY"] = os.getenv("ORT_DIRECTORY", "")
if setup_configs["WITH_GPU"] == "ON": if setup_configs["WITH_GPU"] == "ON" or setup_configs["BUILD_ON_JETSON"] == "ON":
wheel_name = "fastdeploy-gpu-python" wheel_name = "fastdeploy-gpu-python"
if os.getenv("CMAKE_CXX_COMPILER", None) is not None: if os.getenv("CMAKE_CXX_COMPILER", None) is not None:

2
scripts/patch_paddle_inference.py
View File

@@ -28,4 +28,4 @@ def process_paddle_inference(paddle_inference_so_file):
command = "patchelf --set-rpath '{}' {}".format(":".join(rpaths), paddle_inference_so_file) command = "patchelf --set-rpath '{}' {}".format(":".join(rpaths), paddle_inference_so_file)
if platform.machine() != 'sw_64' and platform.machine() != 'mips64': if platform.machine() != 'sw_64' and platform.machine() != 'mips64':
assert subprocess.Popen(command, shell=True) != 0, "patchelf {} failed, the command: {}".format(command, lib) assert os.system(command) == 0, "patchelf {} failed, the command: {}".format(paddle_inference_so_file, command)