From 62c1e95dc2f438e027f94e1dd2f486631489b189 Mon Sep 17 00:00:00 2001 From: Frederick Liardet Date: Wed, 24 Aug 2022 10:07:25 +0100 Subject: Add tosa identification numbers Signed-off-by: Frederick Liardet Change-Id: Idc5668fb01dc8dd657beb911d2cb9295f9275ac6 --- python/tosa_serializer.py | 5 ++++- src/tosa_serialization_handler.cpp | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/python/tosa_serializer.py b/python/tosa_serializer.py index 6915c83..b11f9cd 100644 --- a/python/tosa_serializer.py +++ b/python/tosa_serializer.py @@ -60,6 +60,9 @@ DTypeNames = [ "FLOAT", ] +# File identifier needs to be kept in sync with schema/tosa.fbs +TOSA_GRAPH_IDENTIFIER = b"\x54\x4F\x53\x41" + ByteMask = np.uint64(0xFF) @@ -713,7 +716,7 @@ class TosaSerializer: TosaGraph.TosaGraphAddBlocks(builder, fbv_bb) graph = TosaGraph.TosaGraphEnd(builder) - self.builder.Finish(graph) + self.builder.Finish(graph, TOSA_GRAPH_IDENTIFIER) return self.builder.Output() def writeJson(self, tosa_filename): diff --git a/src/tosa_serialization_handler.cpp b/src/tosa_serialization_handler.cpp index 547c3db..6799d71 100644 --- a/src/tosa_serialization_handler.cpp +++ b/src/tosa_serialization_handler.cpp @@ -354,6 +354,10 @@ tosa_err_t TosaSerializationHandler::Clear() tosa_err_t TosaSerializationHandler::Deserialize(const uint8_t* buf) { + if (!TosaGraphBufferHasIdentifier(buf)) + { + printf("WARNING: TOSA file does not have TOSA file identifier\n"); + } auto fb_tosa_graph = GetTosaGraph(buf); auto fb_tosa_version = fb_tosa_graph->version(); auto fb_tosa_blocks = fb_tosa_graph->blocks(); @@ -764,7 +768,7 @@ tosa_err_t TosaSerializationHandler::Serialize() CreateVersion(_builder, TOSA_VERSION_MAJOR, TOSA_VERSION_MINOR, TOSA_VERSION_PATCH, TOSA_VERSION_DRAFT); auto fb_graph = CreateTosaGraph(_builder, fb_version, fb_blocks); - _builder.Finish(fb_graph); + _builder.Finish(fb_graph, TosaGraphIdentifier()); return TOSA_OK; } -- cgit v1.2.1