[circle-schema] use ubyte for BuiltinOperator (#8451)
author이상규/On-Device Lab(SR)/Principal Engineer/삼성전자 <sg5.lee@samsung.com>
Thu, 24 Oct 2019 10:09:17 +0000 (19:09 +0900)
committer이춘석/On-Device Lab(SR)/Staff Engineer/삼성전자 <chunseok.lee@samsung.com>
Thu, 24 Oct 2019 10:09:17 +0000 (19:09 +0900)
Previously, it was byte, which can't accommodate 254 (instance_norm).

Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>
nnpackage/schema/circle_schema.fbs
runtimes/neurun/frontend/circle/circle_schema_generated.h

index 3de4083..fe0d944 100644 (file)
@@ -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,
index 9f793b9..5f7aad4 100644 (file)
@@ -5605,7 +5605,7 @@ struct OperatorCode FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
   };
   BuiltinOperator builtin_code() const
   {
-    return static_cast<BuiltinOperator>(GetField<int8_t>(VT_BUILTIN_CODE, 0));
+    return static_cast<BuiltinOperator>(GetField<uint8_t>(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<int32_t>(VT_VERSION, 1); }
   bool Verify(flatbuffers::Verifier &verifier) const
   {
-    return VerifyTableStart(verifier) && VerifyField<int8_t>(verifier, VT_BUILTIN_CODE) &&
+    return VerifyTableStart(verifier) && VerifyField<uint8_t>(verifier, VT_BUILTIN_CODE) &&
            VerifyOffset(verifier, VT_CUSTOM_CODE) && verifier.VerifyString(custom_code()) &&
            VerifyField<int32_t>(verifier, VT_VERSION) && verifier.EndTable();
   }
@@ -5626,7 +5626,7 @@ struct OperatorCodeBuilder
   flatbuffers::uoffset_t start_;
   void add_builtin_code(BuiltinOperator builtin_code)
   {
-    fbb_.AddElement<int8_t>(OperatorCode::VT_BUILTIN_CODE, static_cast<int8_t>(builtin_code), 0);
+    fbb_.AddElement<uint8_t>(OperatorCode::VT_BUILTIN_CODE, static_cast<uint8_t>(builtin_code), 0);
   }
   void add_custom_code(flatbuffers::Offset<flatbuffers::String> custom_code)
   {