diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2019-01-15 17:57:00 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-16 15:41:55 +0000 |
| commit | 6c8e8e7594604cca672486db224c1d041b39bfb9 (patch) | |
| tree | bb56e62bbc2411a96c2f770ed947ef057f3185b1 /src/armnnTfLiteParser | |
| parent | e5caff101efb25c4ecae05aed3bbb5eb733edb70 (diff) | |
| download | armnn-6c8e8e7594604cca672486db224c1d041b39bfb9.tar.gz | |
Github issue #120 - Embed TfLite schema
Change-Id: I57375375b2f3f59b89dbf45750f733bf25b5eb90
Diffstat (limited to 'src/armnnTfLiteParser')
| -rw-r--r-- | src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp | 17 | ||||
| -rw-r--r-- | src/armnnTfLiteParser/test/Schema.hpp | 9 | ||||
| -rw-r--r-- | src/armnnTfLiteParser/test/Schema.s | 13 |
3 files changed, 25 insertions, 14 deletions
diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp index 676dc7120d..b372a604f3 100644 --- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp +++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp @@ -5,6 +5,7 @@ #pragma once +#include "Schema.hpp" #include <boost/filesystem.hpp> #include <boost/assert.hpp> #include <boost/format.hpp> @@ -89,24 +90,12 @@ struct ParserFlatbuffersFixture bool ReadStringToBinary() { - const char* schemafileName = getenv("ARMNN_TF_LITE_SCHEMA_PATH"); - if (schemafileName == nullptr) - { - schemafileName = ARMNN_TF_LITE_SCHEMA_PATH; - } - std::string schemafile; - - bool ok = flatbuffers::LoadFile(schemafileName, false, &schemafile); - BOOST_ASSERT_MSG(ok, "Couldn't load schema file " ARMNN_TF_LITE_SCHEMA_PATH); - if (!ok) - { - return false; - } + std::string schemafile(&tflite_schema_start, &tflite_schema_end); // parse schema first, so we can use it to parse the data after flatbuffers::Parser parser; - ok &= parser.Parse(schemafile.c_str()); + bool ok = parser.Parse(schemafile.c_str()); BOOST_ASSERT_MSG(ok, "Failed to parse schema file"); ok &= parser.Parse(m_JsonString.c_str()); diff --git a/src/armnnTfLiteParser/test/Schema.hpp b/src/armnnTfLiteParser/test/Schema.hpp new file mode 100644 index 0000000000..49ecc0e4a4 --- /dev/null +++ b/src/armnnTfLiteParser/test/Schema.hpp @@ -0,0 +1,9 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +extern "C" { +extern const char tflite_schema_start; +extern const char tflite_schema_end; +} diff --git a/src/armnnTfLiteParser/test/Schema.s b/src/armnnTfLiteParser/test/Schema.s new file mode 100644 index 0000000000..6e1959b8c3 --- /dev/null +++ b/src/armnnTfLiteParser/test/Schema.s @@ -0,0 +1,13 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +.section .rodata + +.global tflite_schema_start +.global tflite_schema_end + +tflite_schema_start: +.incbin ARMNN_TF_LITE_SCHEMA_PATH +tflite_schema_end: |