diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-31 13:02:11 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-06-04 17:20:57 +0100 |
| commit | 286080f0d4c4f8a1ca174888f48475e3ec9ac797 (patch) | |
| tree | 6828169a9cf16a585f21b299af6136165c5d8bb6 | |
| parent | f550713476f404a82e59bd68223a8a4955e753f2 (diff) | |
| download | armnn-286080f0d4c4f8a1ca174888f48475e3ec9ac797.tar.gz | |
Do not rebuild the serializer/deserializer code if not necessary
* Make ArmnnSchema_generated.h depend on ArmnnSchema.fbs
so that the serializer code is not rebuilt every time
* Removed unnecessary header usage from the serializer/deserializer code
Change-Id: I35368c9611fcc2b777a4dbffa45d9872772e9dd4
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
| -rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 3 | ||||
| -rwxr-xr-x | src/armnnSerializer/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/armnnSerializer/Serializer.cpp | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 75c258b7ab..b0e7bc2516 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -22,9 +22,6 @@ #include <boost/numeric/conversion/cast.hpp> #include <boost/polymorphic_cast.hpp> -// The generated code based on the Serialize schema: -#include <ArmnnSchema_generated.h> - #include <fstream> #include <algorithm> #include <limits> diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt index a7f85ec871..af2262d5fa 100755 --- a/src/armnnSerializer/CMakeLists.txt +++ b/src/armnnSerializer/CMakeLists.txt @@ -3,11 +3,10 @@ # SPDX-License-Identifier: MIT # if(BUILD_ARMNN_SERIALIZER) - file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/ArmnnSchema_generated.h) - add_custom_command ( - OUTPUT ArmnnSchema_generated.h - COMMAND ${FLATC_DIR}/flatc -o ${CMAKE_CURRENT_BINARY_DIR} --cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ArmnnSchema.fbs + add_custom_command( + # Generate an ArmnnSchema_generated.h file if it doesn't exist, or update it when necessary otherwise + OUTPUT ArmnnSchema_generated.h DEPENDS ArmnnSchema.fbs + COMMAND ${FLATC_DIR}/flatc -o ${CMAKE_CURRENT_BINARY_DIR} --cpp ${CMAKE_CURRENT_SOURCE_DIR}/ArmnnSchema.fbs ) set(armnn_serializer_sources) diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index c49f6f9227..ccf219905f 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -11,8 +11,6 @@ #include <iostream> -#include <ArmnnSchema_generated.h> - #include <boost/numeric/conversion/cast.hpp> #include <flatbuffers/util.h> |