diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-08-05 14:12:11 +0100 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-08-07 15:04:51 +0100 |
commit | e54aa06ec19813b737513ecb8224285d98e871ba (patch) | |
tree | 36bdb824d79abec37aa15e811010e5004854a063 /src/backends/backendsCommon/test/CMakeLists.txt | |
parent | 5488cfaaa1a411cb5a18c81a98b90c6e3011abdc (diff) | |
download | armnn-e54aa06ec19813b737513ecb8224285d98e871ba.tar.gz |
IVGCVSW-3595 Implement the LoadDynamicBackends function in the Runtime class
* Changed the way the handle is acquired, loaded symbols are now kept local
* Updated the makefiles to add more test files for the dynamic backends
* Fixed the GetSharedObjects method so that the files are parsed in
alphabetical order
* Updated the unit tests to make them more strict wrt the order of the
files
* Created a new CreateDynamicBackends method in the utils class
* Added new unit tests for the new function
* Added LoadDynamicBackends in the Runtime class
!android-nn-driver:1707
Change-Id: I1ef9ff3d5455ca6a7fd51cb7cfb3819686234f70
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Diffstat (limited to 'src/backends/backendsCommon/test/CMakeLists.txt')
-rw-r--r-- | src/backends/backendsCommon/test/CMakeLists.txt | 49 |
1 files changed, 48 insertions, 1 deletions
diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 3c6eb19e88..6714a20122 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -87,7 +87,7 @@ list(APPEND testDynamicBackend_sources ) add_library_ex(ValidTestDynamicBackend MODULE ${testDynamicBackend_sources}) -target_compile_definitions(ValidTestDynamicBackend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND) +target_compile_definitions(ValidTestDynamicBackend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_1) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_link_libraries(ValidTestDynamicBackend armnn) @@ -177,3 +177,50 @@ add_custom_target(link_dummy_dynamic_backend ALL file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath2/Arm_GpuAcc_backend.so "Test file for dynamic backend file parsing") file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath3) + +# Dummy dynamic backends for testing. +# These shared objects are used to test the creation of dynamic backend instances in ArmNN. + +add_library_ex(Arm_TestValid2_backend MODULE ${testDynamicBackend_sources}) +target_compile_definitions(Arm_TestValid2_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_2) +target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_link_libraries(Arm_TestValid2_backend armnn) +set_target_properties(Arm_TestValid2_backend PROPERTIES PREFIX "") +set_target_properties(Arm_TestValid2_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) +add_custom_command(TARGET Arm_TestValid2_backend POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:Arm_TestValid2_backend> ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) + +add_library_ex(Arm_TestValid3_backend MODULE ${testDynamicBackend_sources}) +target_compile_definitions(Arm_TestValid3_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_3) +target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_link_libraries(Arm_TestValid3_backend armnn) +set_target_properties(Arm_TestValid3_backend PROPERTIES PREFIX "") +set_target_properties(Arm_TestValid3_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) + +add_library_ex(Arm_TestInvalid8_backend MODULE ${testDynamicBackend_sources}) +target_compile_definitions(Arm_TestInvalid8_backend PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_8) +target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_link_libraries(Arm_TestInvalid8_backend armnn) +set_target_properties(Arm_TestInvalid8_backend PROPERTIES PREFIX "") +set_target_properties(Arm_TestInvalid8_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) + +add_library_ex(Arm_TestValid4_backend MODULE ${testDynamicBackend_sources}) +target_compile_definitions(Arm_TestValid4_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_4) +target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_link_libraries(Arm_TestValid4_backend armnn) +set_target_properties(Arm_TestValid4_backend PROPERTIES PREFIX "") +set_target_properties(Arm_TestValid4_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) + +add_library_ex(Arm_TestInvalid9_backend MODULE ${testDynamicBackend_sources}) +target_compile_definitions(Arm_TestInvalid9_backend PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_9) +target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) +target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_link_libraries(Arm_TestInvalid9_backend armnn) +set_target_properties(Arm_TestInvalid9_backend PROPERTIES PREFIX "") +set_target_properties(Arm_TestInvalid9_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath7) |