From edb5eacf6c51bf2cc6a241656c53b7207fe87992 Mon Sep 17 00:00:00 2001 From: Artem Balyshev Date: Tue, 20 Aug 2024 14:22:46 +0300 Subject: [PATCH] [onert-micro] Update schema version This pr updates circle schema version and flatbuffer version. ONE-DCO-1.0-Signed-off-by: Artem Balyshev --- onert-micro/CMakeLists.txt | 6 +++--- .../onert-micro/include/core/reader/OMCircleReader.h | 1 - onert-micro/standalone/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/onert-micro/CMakeLists.txt b/onert-micro/CMakeLists.txt index d9388173cf4..7537f2955fb 100644 --- a/onert-micro/CMakeLists.txt +++ b/onert-micro/CMakeLists.txt @@ -61,16 +61,16 @@ if (NOT_BUILD_EXTERNALS) else () message(STATUS "DOWNLOAD AND BUILD EXTERNALS") - nnas_find_package(FlatBuffers EXACT 2.0 QUIET) + nnas_find_package(FlatBuffers EXACT 23.5.26 QUIET) if (NOT FlatBuffers_FOUND) - message(STATUS "Build onert-micro failed: FlatBuffers 2.0 NOT FOUND") + message(STATUS "Build onert-micro failed: FlatBuffers 23.5.26 NOT FOUND") return() endif (NOT FlatBuffers_FOUND) message(STATUS "FOUND FlatBuffers") - set(SCHEMA_FILE "${NNAS_PROJECT_SOURCE_DIR}/res/CircleSchema/0.6/circle_schema.fbs") + set(SCHEMA_FILE "${NNAS_PROJECT_SOURCE_DIR}/res/CircleSchema/0.8/circle_schema.fbs") # NOTE Copy circle_schema.fbs as schema.fbs to generate "schema_generated.fbs" instead of "circle_schema_generated.fbs" add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/schema.fbs" diff --git a/onert-micro/onert-micro/include/core/reader/OMCircleReader.h b/onert-micro/onert-micro/include/core/reader/OMCircleReader.h index 90c1d8acc47..5d32d516c05 100644 --- a/onert-micro/onert-micro/include/core/reader/OMCircleReader.h +++ b/onert-micro/onert-micro/include/core/reader/OMCircleReader.h @@ -55,7 +55,6 @@ class OMCircleReader const CircleOperators *operators() const { return _current_subgraph->operators(); } const CircleValues *inputs() const { return _current_subgraph->inputs(); } const CircleValues *outputs() const { return _current_subgraph->outputs(); } - const circle::DataFormat data_format() const { return _current_subgraph->data_format(); } const CircleMetadataSet *metadata() const { return _model->metadata(); } uint32_t num_subgraph() const { return _model->subgraphs()->size(); } diff --git a/onert-micro/standalone/CMakeLists.txt b/onert-micro/standalone/CMakeLists.txt index 68a0334213b..a9630b107e7 100644 --- a/onert-micro/standalone/CMakeLists.txt +++ b/onert-micro/standalone/CMakeLists.txt @@ -3,7 +3,7 @@ project(onert_micro_standalone) include(${NNAS_ROOT}/infra/onert-micro/utils.cmake) if (NOT ${NOT_BUILD_EXTERNALS}) - nnas_find_package(FlatBuffersSource EXACT 2.0 QUIET) + nnas_find_package(FlatBuffersSource EXACT 23.5.26 QUIET) include_directories(${FlatBuffersSource_DIR}/include) else() include_directories(${FlatBuffersSource_DIR})