Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[onert-micro] Update schema version #13725

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions onert-micro/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(); }
Expand Down
2 changes: 1 addition & 1 deletion onert-micro/standalone/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down