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>

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 75c258b..b0e7bc2 100644 (file)
--- 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 a7f85ec..af2262d 100755 (executable)
--- 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 c49f6f9..ccf2199 100644 (file)
--- 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>