diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2020-01-17 11:18:01 +0000 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2020-01-20 20:27:16 +0000 |
| commit | e9d4220f84c14c57503958a3766a62c9bb0b254e (patch) | |
| tree | d2add371232ba7239f876f3eacfd789ce2a805bb | |
| parent | dcf041cfd67acff7ebd524008050b4e1a435c0e5 (diff) | |
| download | armnn-e9d4220f84c14c57503958a3766a62c9bb0b254e.tar.gz | |
IVGCVSW-4239 Remove dynamic link to libOpenCL.so
* Instead rely on ACL's dlopen() to dynamically load the libraries
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I2b451c1c382f3baf51665da9add8f2415353849a
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 21 |
2 files changed, 0 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8616d6dd1e..4d54137937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -561,9 +561,6 @@ target_link_libraries(armnn ${Boost_THREAD_LIBRARY} if(ARMCOMPUTENEON OR ARMCOMPUTECL) target_link_libraries(armnn ${ARMCOMPUTE_LIBRARIES}) endif() -if(ARMCOMPUTECL) - target_link_libraries(armnn ${OPENCL_LIBRARIES}) -endif() if(PROFILING_BACKEND_STREAMLINE AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))) target_link_libraries(armnn pthread) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 19612543b6..014221b9c4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,9 +27,6 @@ if(BUILD_CAFFE_PARSER) target_link_libraries(${testName} armnnCaffeParser) target_link_libraries(${testName} armnn) target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT}) - if(OPENCL_LIBRARIES) - target_link_libraries(${testName} ${OPENCL_LIBRARIES}) - endif() target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} @@ -97,9 +94,6 @@ if(BUILD_TF_PARSER) target_link_libraries(${testName} armnnTfParser) target_link_libraries(${testName} armnn) target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT}) - if(OPENCL_LIBRARIES) - target_link_libraries(${testName} ${OPENCL_LIBRARIES}) - endif() target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} @@ -148,9 +142,6 @@ if (BUILD_TF_LITE_PARSER) target_link_libraries(${testName} armnnTfLiteParser) target_link_libraries(${testName} armnn) target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT}) - if(OPENCL_LIBRARIES) - target_link_libraries(${testName} ${OPENCL_LIBRARIES}) - endif() target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} @@ -230,9 +221,6 @@ if (BUILD_ONNX_PARSER) target_link_libraries(${testName} armnnOnnxParser) target_link_libraries(${testName} armnn) target_link_libraries(${testName} ${CMAKE_THREAD_LIBS_INIT}) - if(OPENCL_LIBRARIES) - target_link_libraries(${testName} ${OPENCL_LIBRARIES}) - endif() target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} @@ -281,9 +269,6 @@ if (BUILD_ARMNN_SERIALIZER OR BUILD_CAFFE_PARSER OR BUILD_TF_PARSER OR BUILD_TF_ target_link_libraries(ExecuteNetwork armnn) target_link_libraries(ExecuteNetwork ${CMAKE_THREAD_LIBS_INIT}) - if(OPENCL_LIBRARIES) - target_link_libraries(ExecuteNetwork ${OPENCL_LIBRARIES}) - endif() target_link_libraries(ExecuteNetwork ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} @@ -309,9 +294,6 @@ if(BUILD_ACCURACY_TOOL) if (BUILD_ONNX_PARSER) target_link_libraries(${executorName} armnnOnnxParser) endif() - if(OPENCL_LIBRARIES) - target_link_libraries(${executorName} ${OPENCL_LIBRARIES}) - endif() target_link_libraries(${executorName} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} @@ -335,9 +317,6 @@ endif() if(BUILD_ARMNN_QUANTIZER) macro(ImageTensorExecutor executorName) target_link_libraries(${executorName} ${CMAKE_THREAD_LIBS_INIT}) - if(OPENCL_LIBRARIES) - target_link_libraries(${executorName} ${OPENCL_LIBRARIES}) - endif() target_link_libraries(${executorName} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} |