Github issue #120 - Embed TfLite schema
Change-Id: I57375375b2f3f59b89dbf45750f733bf25b5eb90
diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
index 676dc71..b372a60 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 @@
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 0000000..49ecc0e
--- /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 0000000..6e1959b
--- /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: