Deprecate scale/offset/border of ResizeAttribute

Signed-off-by: Tai Ly <tai.ly@arm.com>
Change-Id: I8b6f28cfc7fdf395d5f82c07eca53cfd598fe550

5 files changed, 5 insertions, 178 deletions

diff --git a/include/attribute.def b/include/attribute.def
index 0e97629..52d5179 100644
--- a/include/attribute.def
+++ b/include/attribute.def
@@ -57,10 +57,7 @@ DEF_ATTRIBUTE(Pad, 1,
 DEF_ATTRIBUTE(Axis, 1,
               int32_t, S, axis)
 
-DEF_ATTRIBUTE(Resize, 4,
-              int16_t, V, scale,
-              int16_t, V, offset,
-              int16_t, V, border,
+DEF_ATTRIBUTE(Resize, 1,
               ResizeMode, S, mode)
 
 DEF_ATTRIBUTE(Clamp, 2,
diff --git a/include/tosa_generated.h b/include/tosa_generated.h
index c907c89..61bc465 100644
--- a/include/tosa_generated.h
+++ b/include/tosa_generated.h
@@ -1087,31 +1087,13 @@ inline ::flatbuffers::Offset<AxisAttribute> CreateAxisAttribute(
 struct ResizeAttribute FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
   typedef ResizeAttributeBuilder Builder;
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_SCALE = 4,
-    VT_OFFSET = 6,
-    VT_BORDER = 8,
     VT_MODE = 10
   };
-  const ::flatbuffers::Vector<int16_t> *scale() const {
-    return GetPointer<const ::flatbuffers::Vector<int16_t> *>(VT_SCALE);
-  }
-  const ::flatbuffers::Vector<int16_t> *offset() const {
-    return GetPointer<const ::flatbuffers::Vector<int16_t> *>(VT_OFFSET);
-  }
-  const ::flatbuffers::Vector<int16_t> *border() const {
-    return GetPointer<const ::flatbuffers::Vector<int16_t> *>(VT_BORDER);
-  }
   tosa::ResizeMode mode() const {
     return static_cast<tosa::ResizeMode>(GetField<uint32_t>(VT_MODE, 0));
   }
   bool Verify(::flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_SCALE) &&
-           verifier.VerifyVector(scale()) &&
-           VerifyOffset(verifier, VT_OFFSET) &&
-           verifier.VerifyVector(offset()) &&
-           VerifyOffset(verifier, VT_BORDER) &&
-           verifier.VerifyVector(border()) &&
            VerifyField<uint32_t>(verifier, VT_MODE, 4) &&
            verifier.EndTable();
   }
@@ -1121,15 +1103,6 @@ struct ResizeAttributeBuilder {
   typedef ResizeAttribute Table;
   ::flatbuffers::FlatBufferBuilder &fbb_;
   ::flatbuffers::uoffset_t start_;
-  void add_scale(::flatbuffers::Offset<::flatbuffers::Vector<int16_t>> scale) {
-    fbb_.AddOffset(ResizeAttribute::VT_SCALE, scale);
-  }
-  void add_offset(::flatbuffers::Offset<::flatbuffers::Vector<int16_t>> offset) {
-    fbb_.AddOffset(ResizeAttribute::VT_OFFSET, offset);
-  }
-  void add_border(::flatbuffers::Offset<::flatbuffers::Vector<int16_t>> border) {
-    fbb_.AddOffset(ResizeAttribute::VT_BORDER, border);
-  }
   void add_mode(tosa::ResizeMode mode) {
     fbb_.AddElement<uint32_t>(ResizeAttribute::VT_MODE, static_cast<uint32_t>(mode), 0);
   }
@@ -1146,35 +1119,12 @@ struct ResizeAttributeBuilder {
 
 inline ::flatbuffers::Offset<ResizeAttribute> CreateResizeAttribute(
     ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int16_t>> scale = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int16_t>> offset = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int16_t>> border = 0,
     tosa::ResizeMode mode = tosa::ResizeMode_UNKNOWN) {
   ResizeAttributeBuilder builder_(_fbb);
   builder_.add_mode(mode);
-  builder_.add_border(border);
-  builder_.add_offset(offset);
-  builder_.add_scale(scale);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<ResizeAttribute> CreateResizeAttributeDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<int16_t> *scale = nullptr,
-    const std::vector<int16_t> *offset = nullptr,
-    const std::vector<int16_t> *border = nullptr,
-    tosa::ResizeMode mode = tosa::ResizeMode_UNKNOWN) {
-  auto scale__ = scale ? _fbb.CreateVector<int16_t>(*scale) : 0;
-  auto offset__ = offset ? _fbb.CreateVector<int16_t>(*offset) : 0;
-  auto border__ = border ? _fbb.CreateVector<int16_t>(*border) : 0;
-  return tosa::CreateResizeAttribute(
-      _fbb,
-      scale__,
-      offset__,
-      border__,
-      mode);
-}
-
 struct ClampAttribute FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
   typedef ClampAttributeBuilder Builder;
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
diff --git a/python/serializer/tosa_serializer.py b/python/serializer/tosa_serializer.py
index 34178c5..c417fce 100644
--- a/python/serializer/tosa_serializer.py
+++ b/python/serializer/tosa_serializer.py
@@ -225,15 +225,12 @@ class TosaSerializerAttribute(TosaSerializerUnion):
 
         self.ints.append((a.AddAxis, axis))
 
-    def ResizeAttribute(self, scale, offset, border, mode):
+    def ResizeAttribute(self, mode):
         from tosa import ResizeAttribute as a, Attribute
 
         self.utype = Attribute.Attribute().ResizeAttribute
         self.optFcns = (a.Start, a.End)
 
-        self.int16vecs.append((a.AddScale, scale))
-        self.int16vecs.append((a.AddOffset, offset))
-        self.int16vecs.append((a.AddBorder, border))
         self.ints.append((a.AddMode, mode))
 
     def ClampAttribute(self, serializer_builder, min_val_as_bytes, max_val_as_bytes):
diff --git a/python/tosa/ResizeAttribute.py b/python/tosa/ResizeAttribute.py
index 44f7d31..f2a6992 100644
--- a/python/tosa/ResizeAttribute.py
+++ b/python/tosa/ResizeAttribute.py
@@ -29,87 +29,6 @@ class ResizeAttribute(object):
         self._tab = flatbuffers.table.Table(buf, pos)
 
     # ResizeAttribute
-    def Scale(self, j):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
-        if o != 0:
-            a = self._tab.Vector(o)
-            return self._tab.Get(flatbuffers.number_types.Int16Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 2))
-        return 0
-
-    # ResizeAttribute
-    def ScaleAsNumpy(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
-        if o != 0:
-            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int16Flags, o)
-        return 0
-
-    # ResizeAttribute
-    def ScaleLength(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
-        if o != 0:
-            return self._tab.VectorLen(o)
-        return 0
-
-    # ResizeAttribute
-    def ScaleIsNone(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
-        return o == 0
-
-    # ResizeAttribute
-    def Offset(self, j):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
-        if o != 0:
-            a = self._tab.Vector(o)
-            return self._tab.Get(flatbuffers.number_types.Int16Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 2))
-        return 0
-
-    # ResizeAttribute
-    def OffsetAsNumpy(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
-        if o != 0:
-            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int16Flags, o)
-        return 0
-
-    # ResizeAttribute
-    def OffsetLength(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
-        if o != 0:
-            return self._tab.VectorLen(o)
-        return 0
-
-    # ResizeAttribute
-    def OffsetIsNone(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
-        return o == 0
-
-    # ResizeAttribute
-    def Border(self, j):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
-        if o != 0:
-            a = self._tab.Vector(o)
-            return self._tab.Get(flatbuffers.number_types.Int16Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 2))
-        return 0
-
-    # ResizeAttribute
-    def BorderAsNumpy(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
-        if o != 0:
-            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int16Flags, o)
-        return 0
-
-    # ResizeAttribute
-    def BorderLength(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
-        if o != 0:
-            return self._tab.VectorLen(o)
-        return 0
-
-    # ResizeAttribute
-    def BorderIsNone(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
-        return o == 0
-
-    # ResizeAttribute
     def Mode(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
         if o != 0:
@@ -122,42 +41,6 @@ def ResizeAttributeStart(builder):
 def Start(builder):
     ResizeAttributeStart(builder)
 
-def ResizeAttributeAddScale(builder, scale):
-    builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(scale), 0)
-
-def AddScale(builder, scale):
-    ResizeAttributeAddScale(builder, scale)
-
-def ResizeAttributeStartScaleVector(builder, numElems):
-    return builder.StartVector(2, numElems, 2)
-
-def StartScaleVector(builder, numElems):
-    return ResizeAttributeStartScaleVector(builder, numElems)
-
-def ResizeAttributeAddOffset(builder, offset):
-    builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(offset), 0)
-
-def AddOffset(builder, offset):
-    ResizeAttributeAddOffset(builder, offset)
-
-def ResizeAttributeStartOffsetVector(builder, numElems):
-    return builder.StartVector(2, numElems, 2)
-
-def StartOffsetVector(builder, numElems):
-    return ResizeAttributeStartOffsetVector(builder, numElems)
-
-def ResizeAttributeAddBorder(builder, border):
-    builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(border), 0)
-
-def AddBorder(builder, border):
-    ResizeAttributeAddBorder(builder, border)
-
-def ResizeAttributeStartBorderVector(builder, numElems):
-    return builder.StartVector(2, numElems, 2)
-
-def StartBorderVector(builder, numElems):
-    return ResizeAttributeStartBorderVector(builder, numElems)
-
 def ResizeAttributeAddMode(builder, mode):
     builder.PrependUint32Slot(3, mode, 0)
 
diff --git a/schema/tosa.fbs b/schema/tosa.fbs
index cad6db7..1a2d952 100644
--- a/schema/tosa.fbs
+++ b/schema/tosa.fbs
@@ -191,9 +191,9 @@ table AxisAttribute {
 }
 
 table ResizeAttribute {
-  scale: [int16];
-  offset: [int16];
-  border: [int16];
+  scale: [int16] (deprecated);
+  offset: [int16] (deprecated);
+  border: [int16] (deprecated);
   mode: ResizeMode;
 }