colin
/
TIM-VX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed viplite driver build issue (#611) 

Signed-off-by: Chen <jack.chen@verisilicon.com>
Co-authored-by: Chen <jack.chen@verisilicon.com>
This commit is contained in:
chxin66 2023-06-26 09:14:42 +08:00 committed by GitHub
parent 75882d4195
commit 233eb439e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tim/CMakeLists.txt
View File

@ -10,6 +10,8 @@ if(NOT ${TIM_VX_ENABLE_CUSTOM_OP})
endif() endif()
set(${TARGET_NAME}_SRCS) set(${TARGET_NAME}_SRCS)
set(LITE_INC_DIRS)
set(LITE_EXTERNAL_LIBS)
list(APPEND ${TARGET_NAME}_SRCS list(APPEND ${TARGET_NAME}_SRCS
${VX_SRC} ${VX_SRC}
${OPS_SRC}) ${OPS_SRC})
@ -57,10 +59,10 @@ if(TIM_VX_ENABLE_PLATFORM)
if(NOT VIP_LITE_SDK) if(NOT VIP_LITE_SDK)
message(FATAL_ERROR "Please set VIP_LITE_SDK when using lite platform(TIM_VX_ENABLE_PLATFORM_LITE)") message(FATAL_ERROR "Please set VIP_LITE_SDK when using lite platform(TIM_VX_ENABLE_PLATFORM_LITE)")
endif() endif()
list(APPEND EXTERNAL_LIBS list(APPEND LITE_EXTERNAL_LIBS
${VIP_LITE_SDK}/drivers/libNBGlinker.so ${VIP_LITE_SDK}/drivers/libNBGlinker.so
${VIP_LITE_SDK}/drivers/libVIPlite.so) ${VIP_LITE_SDK}/drivers/libVIPlite.so)
list(APPEND INC_DIRS ${VIP_LITE_SDK}/include) list(APPEND LITE_INC_DIRS ${VIP_LITE_SDK}/include)
endif() endif()
if(TIM_VX_ENABLE_GRPC) if(TIM_VX_ENABLE_GRPC)
@ -104,9 +106,7 @@ foreach(src_file ${${TARGET_NAME}_SRCS})
endif() endif()
endforeach() endforeach()
set(EXTERNAL_LIBS) list(APPEND LITE_INC_DIRS
set(INC_DIRS)
list(APPEND INC_DIRS
${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/vx ${CMAKE_CURRENT_SOURCE_DIR}/vx
${CMAKE_CURRENT_SOURCE_DIR}/transform ${CMAKE_CURRENT_SOURCE_DIR}/transform
@ -117,12 +117,12 @@ if(${TIM_VX_ENABLE_VIPLITE})
aux_source_directory(./lite LITE_SRC) aux_source_directory(./lite LITE_SRC)
list(APPEND ${TARGET_NAME}_SRCS list(APPEND ${TARGET_NAME}_SRCS
${LITE_SRC}) ${LITE_SRC})
list(APPEND EXTERNAL_LIBS ${VIPLITE_DRV_LIBRARIES}) list(APPEND LITE_EXTERNAL_LIBS ${VIPLITE_DRV_LIBRARIES})
list(APPEND INC_DIRS list(APPEND LITE_INC_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/lite ${CMAKE_CURRENT_SOURCE_DIR}/lite
${VIPLITE_DRV_INCLUDE_DIR}) ${VIPLITE_DRV_INCLUDE_DIR})
endif() endif()
include_directories(${INC_DIRS}) include_directories(${LITE_INC_DIRS})
# convert op list as compile flags so that we can implement compile compatable easier # convert op list as compile flags so that we can implement compile compatable easier
if(${TIM_VX_USE_EXTERNAL_OVXLIB}) if(${TIM_VX_USE_EXTERNAL_OVXLIB})
file(STRINGS "${OVXLIB_INC}/interface/ops.def" ops_file_content) file(STRINGS "${OVXLIB_INC}/interface/ops.def" ops_file_content)
@ -143,9 +143,9 @@ string(REGEX REPLACE "\\)" " " custom_op_as_flags ${custom_op_list_tmp})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${op_as_flags} ${custom_op_as_flags}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${op_as_flags} ${custom_op_as_flags}")
add_library(${TARGET_NAME} ${${TARGET_NAME}_SRCS}) add_library(${TARGET_NAME} ${${TARGET_NAME}_SRCS})
target_include_directories(${TARGET_NAME} PRIVATE ${INC_DIRS}) target_include_directories(${TARGET_NAME} PRIVATE ${LITE_INC_DIRS})
target_link_libraries(${TARGET_NAME} PUBLIC target_link_libraries(${TARGET_NAME} PUBLIC
-Wl,--no-whole-archive ${OVXDRV_LIBRARIES} ${EXTERNAL_LIBS}) -Wl,--no-whole-archive ${OVXDRV_LIBRARIES} ${LITE_EXTERNAL_LIBS})
if(${TIM_VX_ENABLE_TENSOR_CACHE}) if(${TIM_VX_ENABLE_TENSOR_CACHE})
add_dependencies(${TARGET_NAME} crypto) add_dependencies(${TARGET_NAME} crypto)
@ -235,7 +235,7 @@ if(TIM_VX_ENABLE_TEST)
${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/vx ${CMAKE_CURRENT_SOURCE_DIR}/vx
${OVXLIB_INCLUDE_DIR} ${OVXLIB_INCLUDE_DIR}
${INC_DIRS}) ${LITE_INC_DIRS})
install(TARGETS unit_test DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}) install(TARGETS unit_test DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})
endif() endif()

2
src/tim/vx/platform/lite/lite_native.cc
View File

@ -96,7 +96,7 @@ bool LiteNativeExecutor::Trigger(bool async) {
status = vip_wait_task(task_descriptor_); status = vip_wait_task(task_descriptor_);
if (status != VIP_SUCCESS) { if (status != VIP_SUCCESS) {
VSILOGE("wait task descriptor fail"); VSILOGE("wait task descriptor fail");
nbg_gen_capture(networks.size(), networks.data()); // nbg_gen_capture(networks.size(), networks.data());
return false; return false;
} }
return true; return true;