提交 0aa9729e 编写于 作者: B BohaoWu

Addjust CMakelists.txt.

Addjust param for linux cmd.
上级 ed22d3aa
add_subdirectory(hwvideoframe) if(NOT WITH_GPU)
add_subdirectory(nvdec-extractframe) message("GPU preprocess will not be compiled.")
return()
endif()
message(STATUS "CUDA detected: " ${CUDA_VERSION})
if (${CUDA_VERSION} LESS 10.0)
message("CUDA version should be 10.0.")
return()
elseif (${CUDA_VERSION} LESS 10.1) # CUDA 10.0
add_subdirectory(hwvideoframe)
add_subdirectory(nvdec-extractframe)
endif()
...@@ -10,7 +10,7 @@ set(CMAKE_C_FLAGS " -g -pipe -W -Wall -fPIC") ...@@ -10,7 +10,7 @@ set(CMAKE_C_FLAGS " -g -pipe -W -Wall -fPIC")
set(CMAKE_CXX_FLAGS " -g -pipe -W -Wall -fPIC -std=c++11") set(CMAKE_CXX_FLAGS " -g -pipe -W -Wall -fPIC -std=c++11")
add_subdirectory(cuda) add_subdirectory(cuda)
set(PYTHON_SO "${CMAKE_SOURCE_DIR}/core/preprocess/hwvideoframe/lib/libpython2.7.so") set(PYTHON_SO {PYTHON_LIBRARY})
set(EXTRA_LIBS ${EXTRA_LIBS} gpu) set(EXTRA_LIBS ${EXTRA_LIBS} gpu)
file(GLOB SOURCE_FILES pybind/*.cpp src/*.cpp) file(GLOB SOURCE_FILES pybind/*.cpp src/*.cpp)
......
...@@ -30,7 +30,7 @@ include_directories(./include) ...@@ -30,7 +30,7 @@ include_directories(./include)
include_directories(./codessdkinclude/include) include_directories(./codessdkinclude/include)
include_directories(./ffmpeginclude/include) include_directories(./ffmpeginclude/include)
# include_directories(./pybind11/include) # include_directories(./pybind11/include)
include_directories(./pythoninclude/python2.7/) include_directories({PYTHON_INCLUDE_DIR})
include_directories(./Utils) include_directories(./Utils)
include_directories(${CUDA_TOOLKIT_INCLUDE}) include_directories(${CUDA_TOOLKIT_INCLUDE})
......
...@@ -40,12 +40,12 @@ max_version, mid_version, min_version = python_version() ...@@ -40,12 +40,12 @@ max_version, mid_version, min_version = python_version()
if '${PACK}' == 'ON': if '${PACK}' == 'ON':
copy_lib() copy_lib()
os.system('mkdir ./paddle_serving_app/reader/lib') os.system('mkdir -p ./paddle_serving_app/reader/lib')
os.system('cp ../core/preprocess/hwvideoframe/libgpupreprocess.so ./paddle_serving_app/reader') os.system('cp -a -f ../core/preprocess/hwvideoframe/libgpupreprocess.so ./paddle_serving_app/reader')
os.system('cp ../core/preprocess/nvdec-extractframe/libhwextract.so ./paddle_serving_app/reader') os.system('cp -a -f ../core/preprocess/nvdec-extractframe/libhwextract.so ./paddle_serving_app/reader')
os.system('cp ../core/preprocess/hwvideoframe/cuda/libgpu.so ./paddle_serving_app/reader/lib') os.system('cp -a -f ../core/preprocess/hwvideoframe/cuda/libgpu.so ./paddle_serving_app/reader/lib')
os.system('cp ../core/preprocess/nvdec-extractframe/cuda/libhwgpu.so ./paddle_serving_app/reader/lib') os.system('cp -a -f ../core/preprocess/nvdec-extractframe/cuda/libhwgpu.so ./paddle_serving_app/reader/lib')
os.system('cp -a -i ../../core/preprocess/nvdec-extractframe/lib/* ./paddle_serving_app/reader/lib') os.system('cp -a -f ../../core/preprocess/nvdec-extractframe/lib/* ./paddle_serving_app/reader/lib')
os.system('export LD_LIBRARY_PATH="./paddle_serving_app/reader/lib"') os.system('export LD_LIBRARY_PATH="./paddle_serving_app/reader/lib"')
REQUIRED_PACKAGES = [ REQUIRED_PACKAGES = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册