From: 이상규/On-Device Lab(SR)/Principal Engineer/삼성전자 Date: Thu, 24 Oct 2019 10:09:17 +0000 (+0900) Subject: [circle-schema] use ubyte for BuiltinOperator (#8451) X-Git-Tag: submit/tizen/20191205.083104~599 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b027f8f6fe0631ad73c8eb28f96bd3c2e47d8bcf;p=platform%2Fcore%2Fml%2Fnnfw.git [circle-schema] use ubyte for BuiltinOperator (#8451) Previously, it was byte, which can't accommodate 254 (instance_norm). Signed-off-by: Sanggyu Lee --- diff --git a/nnpackage/schema/circle_schema.fbs b/nnpackage/schema/circle_schema.fbs index 3de4083..fe0d944 100644 --- a/nnpackage/schema/circle_schema.fbs +++ b/nnpackage/schema/circle_schema.fbs @@ -92,7 +92,7 @@ table Tensor { // ones, but not by much. Moreover, while custom operators accept an opaque // object containing configuration parameters, builtins have a predetermined // set of acceptable options. -enum BuiltinOperator : byte { +enum BuiltinOperator : ubyte { ADD = 0, AVERAGE_POOL_2D = 1, CONCATENATION = 2, diff --git a/runtimes/neurun/frontend/circle/circle_schema_generated.h b/runtimes/neurun/frontend/circle/circle_schema_generated.h index 9f793b9..5f7aad4 100644 --- a/runtimes/neurun/frontend/circle/circle_schema_generated.h +++ b/runtimes/neurun/frontend/circle/circle_schema_generated.h @@ -5605,7 +5605,7 @@ struct OperatorCode FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table }; BuiltinOperator builtin_code() const { - return static_cast(GetField(VT_BUILTIN_CODE, 0)); + return static_cast(GetField(VT_BUILTIN_CODE, 0)); } const flatbuffers::String *custom_code() const { @@ -5614,7 +5614,7 @@ struct OperatorCode FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table int32_t version() const { return GetField(VT_VERSION, 1); } bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && VerifyField(verifier, VT_BUILTIN_CODE) && + return VerifyTableStart(verifier) && VerifyField(verifier, VT_BUILTIN_CODE) && VerifyOffset(verifier, VT_CUSTOM_CODE) && verifier.VerifyString(custom_code()) && VerifyField(verifier, VT_VERSION) && verifier.EndTable(); } @@ -5626,7 +5626,7 @@ struct OperatorCodeBuilder flatbuffers::uoffset_t start_; void add_builtin_code(BuiltinOperator builtin_code) { - fbb_.AddElement(OperatorCode::VT_BUILTIN_CODE, static_cast(builtin_code), 0); + fbb_.AddElement(OperatorCode::VT_BUILTIN_CODE, static_cast(builtin_code), 0); } void add_custom_code(flatbuffers::Offset custom_code) {