Update CustomOp's attribute Names

- CustomOp's two attribute names have been changed to
  - domain to domain_name
  - operator to operator_name

Signed-off-by: Jerry Ge <jerry.ge@arm.com>
Change-Id: I382ff2cf98da0487f096938c3693428e91dce386

4 files changed, 38 insertions, 39 deletions

diff --git a/include/attribute.def b/include/attribute.def
index dc7a569..8d74ff9 100644
--- a/include/attribute.def
+++ b/include/attribute.def
@@ -124,8 +124,8 @@ DEF_ATTRIBUTE(Negate, 2,
               int32_t, S, output_zp)
 
 DEF_ATTRIBUTE(Custom, 3,
-              string, S, identifier,
-              string, S, config,
+              string, S, operator_name,
+              string, S, domain_name,
               uint8_t, V, implementation_attrs)
 
 DEF_ATTRIBUTE(FFT, 2,
@@ -134,4 +134,3 @@ DEF_ATTRIBUTE(FFT, 2,
 
 DEF_ATTRIBUTE(RFFT, 1,
               bool, S, local_bound)
-
diff --git a/include/tosa_generated.h b/include/tosa_generated.h
index 6cc0d42..0547316 100644
--- a/include/tosa_generated.h
+++ b/include/tosa_generated.h
@@ -2068,25 +2068,25 @@ inline ::flatbuffers::Offset<NegateAttribute> CreateNegateAttribute(
 struct CustomAttribute FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
   typedef CustomAttributeBuilder Builder;
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_IDENTIFIER = 4,
-    VT_CONFIG = 6,
+    VT_OPERATOR_NAME = 4,
+    VT_DOMAIN_NAME = 6,
     VT_IMPLEMENTATION_ATTRS = 8
   };
-  const ::flatbuffers::String *identifier() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_IDENTIFIER);
+  const ::flatbuffers::String *operator_name() const {
+    return GetPointer<const ::flatbuffers::String *>(VT_OPERATOR_NAME);
   }
-  const ::flatbuffers::String *config() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_CONFIG);
+  const ::flatbuffers::String *domain_name() const {
+    return GetPointer<const ::flatbuffers::String *>(VT_DOMAIN_NAME);
   }
   const ::flatbuffers::Vector<uint8_t> *implementation_attrs() const {
     return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_IMPLEMENTATION_ATTRS);
   }
   bool Verify(::flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_IDENTIFIER) &&
-           verifier.VerifyString(identifier()) &&
-           VerifyOffset(verifier, VT_CONFIG) &&
-           verifier.VerifyString(config()) &&
+           VerifyOffset(verifier, VT_OPERATOR_NAME) &&
+           verifier.VerifyString(operator_name()) &&
+           VerifyOffset(verifier, VT_DOMAIN_NAME) &&
+           verifier.VerifyString(domain_name()) &&
            VerifyOffset(verifier, VT_IMPLEMENTATION_ATTRS) &&
            verifier.VerifyVector(implementation_attrs()) &&
            verifier.EndTable();
@@ -2097,11 +2097,11 @@ struct CustomAttributeBuilder {
   typedef CustomAttribute Table;
   ::flatbuffers::FlatBufferBuilder &fbb_;
   ::flatbuffers::uoffset_t start_;
-  void add_identifier(::flatbuffers::Offset<::flatbuffers::String> identifier) {
-    fbb_.AddOffset(CustomAttribute::VT_IDENTIFIER, identifier);
+  void add_operator_name(::flatbuffers::Offset<::flatbuffers::String> operator_name) {
+    fbb_.AddOffset(CustomAttribute::VT_OPERATOR_NAME, operator_name);
   }
-  void add_config(::flatbuffers::Offset<::flatbuffers::String> config) {
-    fbb_.AddOffset(CustomAttribute::VT_CONFIG, config);
+  void add_domain_name(::flatbuffers::Offset<::flatbuffers::String> domain_name) {
+    fbb_.AddOffset(CustomAttribute::VT_DOMAIN_NAME, domain_name);
   }
   void add_implementation_attrs(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> implementation_attrs) {
     fbb_.AddOffset(CustomAttribute::VT_IMPLEMENTATION_ATTRS, implementation_attrs);
@@ -2119,28 +2119,28 @@ struct CustomAttributeBuilder {
 
 inline ::flatbuffers::Offset<CustomAttribute> CreateCustomAttribute(
     ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> identifier = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> config = 0,
+    ::flatbuffers::Offset<::flatbuffers::String> operator_name = 0,
+    ::flatbuffers::Offset<::flatbuffers::String> domain_name = 0,
     ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> implementation_attrs = 0) {
   CustomAttributeBuilder builder_(_fbb);
   builder_.add_implementation_attrs(implementation_attrs);
-  builder_.add_config(config);
-  builder_.add_identifier(identifier);
+  builder_.add_domain_name(domain_name);
+  builder_.add_operator_name(operator_name);
   return builder_.Finish();
 }
 
 inline ::flatbuffers::Offset<CustomAttribute> CreateCustomAttributeDirect(
     ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *identifier = nullptr,
-    const char *config = nullptr,
+    const char *operator_name = nullptr,
+    const char *domain_name = nullptr,
     const std::vector<uint8_t> *implementation_attrs = nullptr) {
-  auto identifier__ = identifier ? _fbb.CreateString(identifier) : 0;
-  auto config__ = config ? _fbb.CreateString(config) : 0;
+  auto operator_name__ = operator_name ? _fbb.CreateString(operator_name) : 0;
+  auto domain_name__ = domain_name ? _fbb.CreateString(domain_name) : 0;
   auto implementation_attrs__ = implementation_attrs ? _fbb.CreateVector<uint8_t>(*implementation_attrs) : 0;
   return tosa::CreateCustomAttribute(
       _fbb,
-      identifier__,
-      config__,
+      operator_name__,
+      domain_name__,
       implementation_attrs__);
 }
 
diff --git a/python/tosa/CustomAttribute.py b/python/tosa/CustomAttribute.py
index de81970..db35dca 100644
--- a/python/tosa/CustomAttribute.py
+++ b/python/tosa/CustomAttribute.py
@@ -29,14 +29,14 @@ class CustomAttribute(object):
         self._tab = flatbuffers.table.Table(buf, pos)
 
     # CustomAttribute
-    def Identifier(self):
+    def OperatorName(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         if o != 0:
             return self._tab.String(o + self._tab.Pos)
         return None
 
     # CustomAttribute
-    def Config(self):
+    def DomainName(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
         if o != 0:
             return self._tab.String(o + self._tab.Pos)
@@ -75,17 +75,17 @@ def CustomAttributeStart(builder):
 def Start(builder):
     CustomAttributeStart(builder)
 
-def CustomAttributeAddIdentifier(builder, identifier):
-    builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(identifier), 0)
+def CustomAttributeAddOperatorName(builder, operatorName):
+    builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(operatorName), 0)
 
-def AddIdentifier(builder, identifier):
-    CustomAttributeAddIdentifier(builder, identifier)
+def AddOperatorName(builder, operatorName):
+    CustomAttributeAddOperatorName(builder, operatorName)
 
-def CustomAttributeAddConfig(builder, config):
-    builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(config), 0)
+def CustomAttributeAddDomainName(builder, domainName):
+    builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(domainName), 0)
 
-def AddConfig(builder, config):
-    CustomAttributeAddConfig(builder, config)
+def AddDomainName(builder, domainName):
+    CustomAttributeAddDomainName(builder, domainName)
 
 def CustomAttributeAddImplementationAttrs(builder, implementationAttrs):
     builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(implementationAttrs), 0)
diff --git a/schema/tosa.fbs b/schema/tosa.fbs
index 21d3dad..1975667 100644
--- a/schema/tosa.fbs
+++ b/schema/tosa.fbs
@@ -265,8 +265,8 @@ table NegateAttribute {
 }
 
 table CustomAttribute {
-  identifier:string;
-  config:string;
+  operator_name:string;
+  domain_name:string;
   implementation_attrs:[ubyte];
 }