diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2020-03-19 13:53:16 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2020-03-19 21:47:24 +0000 |
commit | b60dd243d3d8131f246f2b122309b998287151d2 (patch) | |
tree | af5e84f753236078006c32957a7d35f4ac708563 /src/backends/reference | |
parent | a0687eef149fbf57bb6db0621ec65724f550b1ed (diff) | |
download | armnn-b60dd243d3d8131f246f2b122309b998287151d2.tar.gz |
IVGCVSW-4565 TENSOR_BOOL8 data type not supported in AndroidNN Driver
* Enabled Boolean and Int32 data types in Reference Comparison inputs
* Added decoder for Boolean data type
* Refactored ClGreaterWorkload to work with any data type
* Refactored NeonGreaterWorkload to work with any data type
!android-nn-driver:2902
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I92772810b744b388831c9dca0119ebf8cb7a447e
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/BaseIterator.hpp | 16 | ||||
-rw-r--r-- | src/backends/reference/workloads/Decoders.hpp | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 9f22b9ef0e..7d3600cf09 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -302,14 +302,15 @@ bool RefLayerSupport::IsComparisonSupported(const TensorInfo& input0, Optional<std::string&> reasonIfUnsupported) const { IgnoreUnused(descriptor); - - std::array<DataType, 5> supportedInputTypes = + std::array<DataType, 7> supportedInputTypes = { + DataType::Boolean, DataType::BFloat16, DataType::Float32, DataType::Float16, DataType::QAsymmU8, - DataType::QSymmS16 + DataType::QSymmS16, + DataType::Signed32 }; bool supported = true; diff --git a/src/backends/reference/workloads/BaseIterator.hpp b/src/backends/reference/workloads/BaseIterator.hpp index 5cae5bda83..f43e8b67a9 100644 --- a/src/backends/reference/workloads/BaseIterator.hpp +++ b/src/backends/reference/workloads/BaseIterator.hpp @@ -275,6 +275,22 @@ public: } }; +class BooleanDecoder : public TypedIterator<const uint8_t, Decoder<float>> +{ +public: + BooleanDecoder(const uint8_t* data) + : TypedIterator(data) {} + + BooleanDecoder() + : BooleanDecoder(nullptr) {} + + float Get() const override + { + return *m_Iterator; + } + +}; + class QASymm8Encoder : public TypedIterator<uint8_t, Encoder<float>> { public: diff --git a/src/backends/reference/workloads/Decoders.hpp b/src/backends/reference/workloads/Decoders.hpp index 83c57c1169..3434ccb764 100644 --- a/src/backends/reference/workloads/Decoders.hpp +++ b/src/backends/reference/workloads/Decoders.hpp @@ -136,6 +136,10 @@ inline std::unique_ptr<Decoder<float>> MakeDecoder(const TensorInfo& info, const info.GetQuantizationOffset()); } } + case armnn::DataType::Boolean: + { + return std::make_unique<BooleanDecoder>(static_cast<const uint8_t*>(data)); + } default: { BOOST_ASSERT_MSG(false, "Unsupported Data Type!"); |