IVGCVSW-5231 Remove CreateTensorHandle in the test where there is NO_DEPRECATE_WARN
* Done for all elementwise layers, Activation, BatchNorm, BatchToSpace
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: Id1d15a0960233026aecf7a07e0d3f006e07e4abf
diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp
index 863e988..5d37e93 100644
--- a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp
+++ b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp
@@ -42,6 +42,7 @@
int quantOffset,
const unsigned int outShape[NumDims],
std::vector<float> outValues,
+ const armnn::ITensorHandleFactory& tensorHandleFactory,
float outQuantScale,
int outQuantOffset)
{
@@ -58,10 +59,8 @@
LayerTestResult<T, NumDims> ret(outputTensorInfo);
- ARMNN_NO_DEPRECATE_WARN_BEGIN
- std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo);
- std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo);
- ARMNN_NO_DEPRECATE_WARN_END
+ std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputTensorInfo);
+ std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputTensorInfo);
armnn::ElementwiseUnaryDescriptor desc(op);
armnn::ElementwiseUnaryQueueDescriptor qDesc;
@@ -97,6 +96,7 @@
std::vector<float> values,
const unsigned int outShape[NumDims],
std::vector<float> outValues,
+ const armnn::ITensorHandleFactory& tensorHandleFactory,
float quantScale = 1.0f,
int quantOffset = 0)
{
@@ -110,6 +110,7 @@
quantOffset,
outShape,
outValues,
+ tensorHandleFactory,
quantScale,
quantOffset);
}
\ No newline at end of file