diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2019-02-25 13:58:24 +0000 |
---|---|---|
committer | Matthew Bentham <Matthew.Bentham@arm.com> | 2019-02-25 15:54:09 +0000 |
commit | 268509ac1750c6c8d7c6f0debd9dca7e42612341 (patch) | |
tree | bb0ee39b98761ff89dfe4601dfee11c8ad08dafe | |
parent | a1ecc49d1beb8d2cbb76c259b73b0f5a537aab2e (diff) | |
download | armnn-268509ac1750c6c8d7c6f0debd9dca7e42612341.tar.gz |
Rename ArmNN schema file to ArmnnSchema.fbs
This makes the header file change to ArmnnSchema_generated.h,
which is then unambiguous with respect to other generated schema files.
Change-Id: Id7785ed74cced4dcd4d6bcbab81e53c6aeba973c
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | cmake/GlobalConfig.cmake | 2 | ||||
-rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 2 | ||||
-rw-r--r-- | src/armnnDeserializer/Deserializer.hpp | 2 | ||||
-rw-r--r-- | src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp | 6 | ||||
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs (renamed from src/armnnSerializer/Schema.fbs) | 0 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 2 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.hpp | 2 | ||||
-rw-r--r-- | src/armnnSerializer/SerializerUtils.hpp | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18c0ca2f35..7db728c52c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,16 +151,16 @@ endif() if(BUILD_ARMNN_SERIALIZER) add_custom_command ( - OUTPUT src/armnnSerializer/Schema_generated.h + OUTPUT src/armnnSerializer/ArmnnSchema_generated.h COMMAND ${FLATC_DIR}/flatc -o ${CMAKE_CURRENT_BINARY_DIR}/src/armnnSerializer --cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/armnnSerializer/Schema.fbs + ${CMAKE_CURRENT_SOURCE_DIR}/src/armnnSerializer/ArmnnSchema.fbs ) set(armnn_serializer_sources) list(APPEND armnn_serializer_sources include/armnnSerializer/ISerializer.hpp include/armnnDeserializer/IDeserializer.hpp - src/armnnSerializer/Schema_generated.h + src/armnnSerializer/ArmnnSchema_generated.h src/armnnSerializer/Serializer.hpp src/armnnSerializer/Serializer.cpp src/armnnSerializer/SerializerUtils.hpp @@ -592,7 +592,7 @@ if(BUILD_UNIT_TESTS) if(BUILD_ARMNN_SERIALIZER) enable_language(ASM) list(APPEND unittest_sources - src/armnnSerializer/Schema_generated.h + src/armnnSerializer/ArmnnSchema_generated.h src/armnnSerializer/test/ActivationSerializationTests.cpp src/armnnSerializer/test/SerializerTests.cpp src/armnnDeserializer/test/DeserializeActivation.cpp diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index ad4869370c..e0ccce4d57 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -198,7 +198,7 @@ endif() if(BUILD_ARMNN_SERIALIZER) include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") add_definitions(-DARMNN_SERIALIZER) - add_definitions(-DARMNN_SERIALIZER_SCHEMA_PATH="${CMAKE_CURRENT_SOURCE_DIR}/src/armnnSerializer/Schema.fbs") + add_definitions(-DARMNN_SERIALIZER_SCHEMA_PATH="${CMAKE_CURRENT_SOURCE_DIR}/src/armnnSerializer/ArmnnSchema.fbs") endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index f5fc0473f5..08fe7a5e90 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -20,7 +20,7 @@ #include <boost/log/trivial.hpp> // The generated code based on the Serialize schema: -#include <Schema_generated.h> +#include <ArmnnSchema_generated.h> #include <fstream> #include <algorithm> diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index d1cb17d3af..1e775d0c4a 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -7,7 +7,7 @@ #include "armnn/INetwork.hpp" #include "armnnDeserializer/IDeserializer.hpp" -#include <Schema_generated.h> +#include <ArmnnSchema_generated.h> namespace armnnDeserializer { diff --git a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp index d6504864ca..8db9d5684b 100644 --- a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp +++ b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp @@ -19,10 +19,10 @@ #include "flatbuffers/idl.h" #include "flatbuffers/util.h" -#include <Schema_generated.h> +#include <ArmnnSchema_generated.h> using armnnDeserializer::IDeserializer; -using TensorRawPtr = armnnSerializer::TensorInfo*; +using TensorRawPtr = armnnSerializer::TensorInfo*; struct ParserFlatbuffersSerializeFixture { @@ -201,4 +201,4 @@ void ParserFlatbuffersSerializeFixture::RunTest(unsigned int layersId, auto outputExpected = MakeTensor<DataType, NumOutputDimensions>(bindingInfo.second, it.second); BOOST_TEST(CompareTensors(outputExpected, outputStorage[it.first])); } -}
\ No newline at end of file +} diff --git a/src/armnnSerializer/Schema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index dc14069798..dc14069798 100644 --- a/src/armnnSerializer/Schema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index b4afd37b99..a0a640e3b7 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -11,7 +11,7 @@ #include <iostream> -#include <Schema_generated.h> +#include <ArmnnSchema_generated.h> #include <flatbuffers/util.h> diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 0a62732ef2..a423aa8a12 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -11,7 +11,7 @@ #include <unordered_map> -#include <Schema_generated.h> +#include <ArmnnSchema_generated.h> namespace armnnSerializer { diff --git a/src/armnnSerializer/SerializerUtils.hpp b/src/armnnSerializer/SerializerUtils.hpp index 71eb01bbeb..9b1dff9112 100644 --- a/src/armnnSerializer/SerializerUtils.hpp +++ b/src/armnnSerializer/SerializerUtils.hpp @@ -6,7 +6,7 @@ #include <armnn/ArmNN.hpp> -#include <Schema_generated.h> +#include <ArmnnSchema_generated.h> namespace armnnSerializer { @@ -24,4 +24,4 @@ armnnSerializer::OutputShapeRounding GetFlatBufferOutputShapeRounding( armnnSerializer::PaddingMethod GetFlatBufferPaddingMethod(armnn::PaddingMethod paddingMethod); -} // namespace armnnSerializer
\ No newline at end of file +} // namespace armnnSerializer |