diff options
author | Tracy Narine <tracy.narine@arm.com> | 2023-07-13 16:50:54 +0100 |
---|---|---|
committer | Tracy Narine <tracy.narine@arm.com> | 2023-07-17 14:19:36 +0100 |
commit | bb8d7591a35bd95480b39001f8b7e41a6671f3a6 (patch) | |
tree | abf2871aa1bb86378f423df405164b0d4521db3f /include | |
parent | 688268328c69e7d4181cdd31fe4717c80a6d1685 (diff) | |
download | armnn-bb8d7591a35bd95480b39001f8b7e41a6671f3a6.tar.gz |
IVGCVSW-7879 Change REVERSE_V2 from LayerWithParameters with 1 input, to Layer with 2 inputs
* Changing ReverseV2 to use two inputs
* This is required by the backends
* The ReverseV2Descriptor was removed
* Tests updated
* Added a Run<> templatefor inputs with different data types
Signed-off-by: Tracy Narine <tracy.narine@arm.com>
Change-Id: I22f947de829b4b3da6bda3a74f4ffdef4052cc25
Diffstat (limited to 'include')
-rw-r--r-- | include/armnn/BackendHelper.hpp | 4 | ||||
-rw-r--r-- | include/armnn/Descriptors.hpp | 24 | ||||
-rw-r--r-- | include/armnn/DescriptorsFwd.hpp | 1 | ||||
-rw-r--r-- | include/armnn/INetwork.hpp | 4 | ||||
-rw-r--r-- | include/armnn/backends/WorkloadData.hpp | 2 |
5 files changed, 4 insertions, 31 deletions
diff --git a/include/armnn/BackendHelper.hpp b/include/armnn/BackendHelper.hpp index 6f804cbbed..6181ba5c40 100644 --- a/include/armnn/BackendHelper.hpp +++ b/include/armnn/BackendHelper.hpp @@ -360,9 +360,9 @@ public: const ResizeDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported = EmptyOptional()); - bool IsReverseV2Supported(const TensorInfo& input, + bool IsReverseV2Supported(const TensorInfo& input0, + const TensorInfo& input1, const TensorInfo& output, - const ReverseV2Descriptor& descriptor, Optional<std::string&> reasonIfUnsupported = EmptyOptional()); bool IsShapeSupported(const TensorInfo& input, diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 27ca50123f..9ff894f1b0 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -1620,28 +1620,4 @@ struct BatchMatMulDescriptor : BaseDescriptor const TensorShape& tensorShape); }; -struct ReverseV2Descriptor : BaseDescriptor -{ - ReverseV2Descriptor() - : m_Axis() - , m_MaxDimension(4) - {} - - ReverseV2Descriptor(std::vector<int32_t> axis) - : m_Axis(axis) - , m_MaxDimension(4) - {} - - bool operator ==(const ReverseV2Descriptor& rhs) const - { - return m_Axis == rhs.m_Axis; - } - - /// The indices of the dimensions to reverse - std::vector<int32_t> m_Axis; - /// The max dimension supported in the lower levels of code - uint32_t m_MaxDimension; - -}; - } // namespace armnn diff --git a/include/armnn/DescriptorsFwd.hpp b/include/armnn/DescriptorsFwd.hpp index 4e9621d020..2c25a49f00 100644 --- a/include/armnn/DescriptorsFwd.hpp +++ b/include/armnn/DescriptorsFwd.hpp @@ -42,7 +42,6 @@ struct QLstmDescriptor; struct ReshapeDescriptor; struct ResizeDescriptor; struct ReduceDescriptor; -struct ReverseV2Descriptor; struct SliceDescriptor; struct SoftmaxDescriptor; struct SpaceToBatchNdDescriptor; diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index e311fa8840..e20dd1c348 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -838,11 +838,9 @@ public: const char* name = nullptr); /// Add a ReverseV2 layer to the network - /// @param descriptor - Parameters for the ReverseV2 operation /// @param name - Optional name for the layer /// @return - Interface for configuring the layer - IConnectableLayer* AddReverseV2Layer(const ReverseV2Descriptor& descriptor, - const char* name = nullptr); + IConnectableLayer* AddReverseV2Layer(const char* name = nullptr); void ExecuteStrategy(IStrategy& strategy) const; diff --git a/include/armnn/backends/WorkloadData.hpp b/include/armnn/backends/WorkloadData.hpp index fe59fca795..e7d5e0e689 100644 --- a/include/armnn/backends/WorkloadData.hpp +++ b/include/armnn/backends/WorkloadData.hpp @@ -750,7 +750,7 @@ struct BatchMatMulQueueDescriptor : QueueDescriptorWithParameters<BatchMatMulDes void Validate(const WorkloadInfo& workloadInfo) const; }; -struct ReverseV2QueueDescriptor : QueueDescriptorWithParameters<ReverseV2Descriptor> +struct ReverseV2QueueDescriptor : QueueDescriptor { void Validate(const WorkloadInfo& workloadInfo) const; }; |