diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-28 16:22:22 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-12-05 11:03:35 +0000 |
| commit | 2135015779092e259ad5d5df185eda0c34b56359 (patch) | |
| tree | 744a46d8f6036ac13fc40ab5001ad2ad05fb4525 /CMakeLists.txt | |
| parent | 24df822711e14cd3099a926272d863ed139ed4d7 (diff) | |
| download | armnn-2135015779092e259ad5d5df185eda0c34b56359.tar.gz | |
IVGCVSW-2264 Move DataLayoutIndexed to armnnUtils
* Since DataLayoutIndexed is now required in the TF parser, this
changes move it to the armnnUtils library so that it'll be
accessible by the armnnTfParser
* Modified CMake files and Android.mk files accordingly
Change-Id: Ie2620359ef288aeff64cb9e9bec068a466eee0e9
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 73f926937c..8b351ad1fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,11 @@ list(APPEND armnnUtils_sources src/armnnUtils/GraphTopologicalSort.hpp src/armnnUtils/Half.hpp src/armnnUtils/Logging.hpp - src/armnnUtils/Permute.hpp src/armnnUtils/Logging.cpp + src/armnnUtils/Permute.hpp src/armnnUtils/Permute.cpp + src/armnnUtils/DataLayoutIndexed.cpp + src/armnnUtils/DataLayoutIndexed.hpp src/armnnUtils/DotSerializer.cpp src/armnnUtils/DotSerializer.hpp src/armnnUtils/HeapProfiling.cpp @@ -137,14 +139,15 @@ if(BUILD_TF_LITE_PARSER) include/armnnTfLiteParser/ITfLiteParser.hpp src/armnnTfLiteParser/TfLiteParser.hpp src/armnnTfLiteParser/TfLiteParser.cpp - ) + ) - add_library_ex(armnnTfLiteParser SHARED ${armnn_tf_lite_parser_sources}) + add_library_ex(armnnTfLiteParser SHARED ${armnn_tf_lite_parser_sources}) - target_include_directories(armnnTfLiteParser PRIVATE src/armnnUtils) + target_include_directories(armnnTfLiteParser PRIVATE src/armnn) + target_include_directories(armnnTfLiteParser PRIVATE src/armnnUtils) - target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) - target_link_libraries(armnnTfLiteParser armnn ${FLATBUFFERS_LIBRARY}) + target_link_libraries(armnnTfLiteParser ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) + target_link_libraries(armnnTfLiteParser armnn ${FLATBUFFERS_LIBRARY}) endif() list(APPEND armnn_sources |