8000 dnn: fix HAVE_TIMVX macro definition in dnn test by fengyuentau · Pull Request #24425 · opencv/opencv · GitHub
[go: up one dir, main page]
Skip to content

dnn: fix HAVE_TIMVX macro definition in dnn test #24425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 20, 2023
Merged

dnn: fix HAVE_TIMVX macro definition in dnn test #24425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41e08bd
fix HAVE_TIMVX macro in dnn test
fengyuentau Oct 18, 2023
269e59d
another solution
fengyuentau Oct 20, 2023
2bc9aa5
fix indentation
fengyuentau Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
another solution
  • Loading branch information
@fengyuentau
fengyuentau committed Oct 20, 2023
commit 269e59da406b90f11e7e99e183f625d704092edf
1 change: 0 additions & 1 deletion cmake/OpenCVFindTIMVX.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ if(TIMVX_FOUND AND TIMVX_VIV_FOUND)
message(STATUS "TIM-VX: Found TIM-VX library: ${TIMVX_LIB}")
set(TIMVX_LIBRARY ${TIMVX_LIB})
set(TIMVX_INCLUDE_DIR ${TIMVX_INC_DIR})
ocv_add_external_target(timvx "${TIMVX_INC_DIR}" "${TIMVX_LIBRARY}" "HAVE_TIMVX")

message(STATUS "TIM-VX: Found VIVANTE SDK libraries: ${VIVANTE_SDK_DIR}/lib")
link_directories(${VIVANTE_SDK_DIR}/lib)
Expand Down
6 changes: 3 additions & 3 deletions modules/dnn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ if(TARGET ocv.3rdparty.cann AND OPENCV_TEST_DNN_CANN)
endif()
endif()

ocv_option(OPENCV_TEST_DNN_TIMVX "Build test with TIM-VX" (TARGET ocv.3rdparty.timvx))
if(TARGET ocv.3rdparty.timvx AND OPENCV_TEST_DNN_TIMVX)
ocv_option(OPENCV_TEST_DNN_TIMVX "Build test with TIM-VX" (HAVE_TIMVX))
if(OPENCV_TEST_DNN_TIMVX)
if(TARGET opencv_test_dnn)
ocv_target_link_libraries(opencv_test_dnn ocv.3rdparty.timvx)
ocv_target_compile_definitions(opencv_test_dnn PRIVATE "HAVE_TIMVX=1")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for finding this! Meanwhile please hold merging this PR until the hardware is in the CI running the tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved.

endif()
endif()

Expand Down
0