1 files changed, 78 insertions, 11 deletions

diff --git a/src/armnnSerializer/ArmnnSchema_generated.h b/src/armnnSerializer/ArmnnSchema_generated.h
index 76a6460c85..8f803f5af2 100644
--- a/src/armnnSerializer/ArmnnSchema_generated.h
+++ b/src/armnnSerializer/ArmnnSchema_generated.h
@@ -1,5 +1,5 @@
 //
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 // automatically generated by the FlatBuffers compiler, do not modify
@@ -131,6 +131,9 @@ struct GatherLayerBuilder;
 struct GatherDescriptor;
 struct GatherDescriptorBuilder;
 
+struct GatherNdLayer;
+struct GatherNdLayerBuilder;
+
 struct GreaterLayer;
 struct GreaterLayerBuilder;
 
@@ -777,11 +780,12 @@ enum LayerType {
   LayerType_ChannelShuffle = 64,
   LayerType_Convolution3d = 65,
   LayerType_Pooling3d = 66,
+  LayerType_GatherNd = 67,
   LayerType_MIN = LayerType_Addition,
-  LayerType_MAX = LayerType_Pooling3d
+  LayerType_MAX = LayerType_GatherNd
 };
 
-inline const LayerType (&EnumValuesLayerType())[67] {
+inline const LayerType (&EnumValuesLayerType())[68] {
   static const LayerType values[] = {
     LayerType_Addition,
     LayerType_Input,
@@ -849,13 +853,14 @@ inline const LayerType (&EnumValuesLayerType())[67] {
     LayerType_UnidirectionalSequenceLstm,
     LayerType_ChannelShuffle,
     LayerType_Convolution3d,
-    LayerType_Pooling3d
+    LayerType_Pooling3d,
+    LayerType_GatherNd
   };
   return values;
 }
 
 inline const char * const *EnumNamesLayerType() {
-  static const char * const names[68] = {
+  static const char * const names[69] = {
     "Addition",
     "Input",
     "Multiplication",
@@ -923,13 +928,14 @@ inline const char * const *EnumNamesLayerType() {
     "ChannelShuffle",
     "Convolution3d",
     "Pooling3d",
+    "GatherNd",
     nullptr
   };
   return names;
 }
 
 inline const char *EnumNameLayerType(LayerType e) {
-  if (flatbuffers::IsOutRange(e, LayerType_Addition, LayerType_Pooling3d)) return "";
+  if (flatbuffers::IsOutRange(e, LayerType_Addition, LayerType_GatherNd)) return "";
   const size_t index = static_cast<size_t>(e);
   return EnumNamesLayerType()[index];
 }
@@ -1309,11 +1315,12 @@ enum Layer {
   Layer_ChannelShuffleLayer = 65,
   Layer_Convolution3dLayer = 66,
   Layer_Pooling3dLayer = 67,
+  Layer_GatherNdLayer = 68,
   Layer_MIN = Layer_NONE,
-  Layer_MAX = Layer_Pooling3dLayer
+  Layer_MAX = Layer_GatherNdLayer
 };
 
-inline const Layer (&EnumValuesLayer())[68] {
+inline const Layer (&EnumValuesLayer())[69] {
   static const Layer values[] = {
     Layer_NONE,
     Layer_ActivationLayer,
@@ -1382,13 +1389,14 @@ inline const Layer (&EnumValuesLayer())[68] {
     Layer_UnidirectionalSequenceLstmLayer,
     Layer_ChannelShuffleLayer,
     Layer_Convolution3dLayer,
-    Layer_Pooling3dLayer
+    Layer_Pooling3dLayer,
+    Layer_GatherNdLayer
   };
   return values;
 }
 
 inline const char * const *EnumNamesLayer() {
-  static const char * const names[69] = {
+  static const char * const names[70] = {
     "NONE",
     "ActivationLayer",
     "AdditionLayer",
@@ -1457,13 +1465,14 @@ inline const char * const *EnumNamesLayer() {
     "ChannelShuffleLayer",
     "Convolution3dLayer",
     "Pooling3dLayer",
+    "GatherNdLayer",
     nullptr
   };
   return names;
 }
 
 inline const char *EnumNameLayer(Layer e) {
-  if (flatbuffers::IsOutRange(e, Layer_NONE, Layer_Pooling3dLayer)) return "";
+  if (flatbuffers::IsOutRange(e, Layer_NONE, Layer_GatherNdLayer)) return "";
   const size_t index = static_cast<size_t>(e);
   return EnumNamesLayer()[index];
 }
@@ -1740,6 +1749,10 @@ template<> struct LayerTraits<armnnSerializer::Pooling3dLayer> {
   static const Layer enum_value = Layer_Pooling3dLayer;
 };
 
+template<> struct LayerTraits<armnnSerializer::GatherNdLayer> {
+  static const Layer enum_value = Layer_GatherNdLayer;
+};
+
 bool VerifyLayer(flatbuffers::Verifier &verifier, const void *obj, Layer type);
 bool VerifyLayerVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
 
@@ -4186,6 +4199,49 @@ inline flatbuffers::Offset<GatherDescriptor> CreateGatherDescriptor(
   return builder_.Finish();
 }
 
+struct GatherNdLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  typedef GatherNdLayerBuilder Builder;
+  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
+    VT_BASE = 4
+  };
+  const armnnSerializer::LayerBase *base() const {
+    return GetPointer<const armnnSerializer::LayerBase *>(VT_BASE);
+  }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyOffset(verifier, VT_BASE) &&
+           verifier.VerifyTable(base()) &&
+           verifier.EndTable();
+  }
+};
+
+struct GatherNdLayerBuilder {
+  typedef GatherNdLayer Table;
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_base(flatbuffers::Offset<armnnSerializer::LayerBase> base) {
+    fbb_.AddOffset(GatherNdLayer::VT_BASE, base);
+  }
+  explicit GatherNdLayerBuilder(flatbuffers::FlatBufferBuilder &_fbb)
+        : fbb_(_fbb) {
+    start_ = fbb_.StartTable();
+  }
+  GatherNdLayerBuilder &operator=(const GatherNdLayerBuilder &);
+  flatbuffers::Offset<GatherNdLayer> Finish() {
+    const auto end = fbb_.EndTable(start_);
+    auto o = flatbuffers::Offset<GatherNdLayer>(end);
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<GatherNdLayer> CreateGatherNdLayer(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<armnnSerializer::LayerBase> base = 0) {
+  GatherNdLayerBuilder builder_(_fbb);
+  builder_.add_base(base);
+  return builder_.Finish();
+}
+
 /// @deprecated Use ComparisonLayer instead
 struct GreaterLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   typedef GreaterLayerBuilder Builder;
@@ -10534,6 +10590,9 @@ struct AnyLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   const armnnSerializer::Pooling3dLayer *layer_as_Pooling3dLayer() const {
     return layer_type() == armnnSerializer::Layer_Pooling3dLayer ? static_cast<const armnnSerializer::Pooling3dLayer *>(layer()) : nullptr;
   }
+  const armnnSerializer::GatherNdLayer *layer_as_GatherNdLayer() const {
+    return layer_type() == armnnSerializer::Layer_GatherNdLayer ? static_cast<const armnnSerializer::GatherNdLayer *>(layer()) : nullptr;
+  }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<uint8_t>(verifier, VT_LAYER_TYPE) &&
@@ -10811,6 +10870,10 @@ template<> inline const armnnSerializer::Pooling3dLayer *AnyLayer::layer_as<armn
   return layer_as_Pooling3dLayer();
 }
 
+template<> inline const armnnSerializer::GatherNdLayer *AnyLayer::layer_as<armnnSerializer::GatherNdLayer>() const {
+  return layer_as_GatherNdLayer();
+}
+
 struct AnyLayerBuilder {
   typedef AnyLayer Table;
   flatbuffers::FlatBufferBuilder &fbb_;
@@ -11309,6 +11372,10 @@ inline bool VerifyLayer(flatbuffers::Verifier &verifier, const void *obj, Layer
       auto ptr = reinterpret_cast<const armnnSerializer::Pooling3dLayer *>(obj);
       return verifier.VerifyTable(ptr);
     }
+    case Layer_GatherNdLayer: {
+      auto ptr = reinterpret_cast<const armnnSerializer::GatherNdLayer *>(obj);
+      return verifier.VerifyTable(ptr);
+    }
     default: return true;
   }
 }