From 4b10fef654c5d54b73cc6f09327a88976d8c0fc4 Mon Sep 17 00:00:00 2001
From: Teresa Charlin <teresa.charlinreyes@arm.com>
Date: Wed, 29 Jul 2020 09:36:41 +0100
Subject: IVGCVSW-4712 Fill layer datatype adjustments * Input layer to be
 int32 instead of same type as output * Enable float16 end to end tests * Neon
 and Cl layer support check for backend

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I6bc889077c8da63eeff66bd45730ce5d8783c419
---
 src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp  | 14 +++++++++-----
 .../backendsCommon/test/layerTests/FillTestImpl.cpp        |  7 ++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/backends/backendsCommon/test')

diff --git a/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp
index f734a948ab..5d7601b14b 100644
--- a/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/FillEndToEndTestImpl.hpp
@@ -39,27 +39,31 @@ void FillEndToEnd(const std::vector<armnn::BackendId>& backends)
     FillDescriptor descriptor;
     descriptor.m_Value = 9;
 
-    std::vector<T> inputData{
+    std::vector<int32_t> inputData {
             1, 1, 5, 3
     };
 
-    std::vector<T> expectedOutputData{
+    std::vector<float> floatExpectedOutputData {
             9, 9, 9, 9, 9,
             9, 9, 9, 9, 9,
             9, 9, 9, 9, 9
     };
+    std::vector<T> expectedOutputData = armnnUtils::QuantizedVector<T>(floatExpectedOutputData);
 
-    TensorInfo inputInfo ({ 4 }, ArmnnType);
+    TensorInfo inputInfo ({ 4 }, DataType::Signed32);
     TensorInfo outputInfo({ 1, 1, 5, 3 }, ArmnnType);
 
     armnn::INetworkPtr network = CreateFillNetwork(inputInfo, outputInfo, descriptor);
 
     BOOST_TEST_CHECKPOINT("create a network");
 
-    std::map<int, std::vector<T>> inputTensorData          = {{ 0, inputData }};
+    std::map<int, std::vector<int32_t>> inputTensorData    = {{ 0, inputData }};
     std::map<int, std::vector<T>> expectedOutputTensorData = {{ 0, expectedOutputData }};
 
-    EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(network), inputTensorData, expectedOutputTensorData, backends);
+    EndToEndLayerTestImpl<DataType::Signed32, ArmnnType>(move(network),
+                                                         inputTensorData,
+                                                         expectedOutputTensorData,
+                                                         backends);
 }
 
 } // anonymous namespace
\ No newline at end of file
diff --git a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp
index 64970fecdf..040a988729 100644
--- a/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/FillTestImpl.cpp
@@ -17,13 +17,10 @@ LayerTestResult<T, 4> SimpleFillTest(
     const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager)
 {
     IgnoreUnused(memoryManager);
-    armnn::TensorInfo inputTensorInfo({4}, ArmnnType);
-    inputTensorInfo.SetQuantizationScale(0.0f);
-
+    armnn::TensorInfo inputTensorInfo({4}, armnn::DataType::Signed32);
     armnn::TensorInfo outputTensorInfo({2, 2, 3, 2}, ArmnnType);
-    outputTensorInfo.SetQuantizationScale(0.0f);
 
-    auto input = MakeTensor<T, 1>(inputTensorInfo, ConvertToDataType<ArmnnType>(
+    auto input = MakeTensor<int32_t, 1>(inputTensorInfo, ConvertToDataType<armnn::DataType::Signed32>(
         {2, 2, 3, 2},
         inputTensorInfo));
 
-- 
cgit v1.2.1