diff options
| author | Keith Davis <keith.davis@arm.com> | 2020-08-27 15:38:12 +0100 |
|---|---|---|
| committer | KeithARM <keith.davis@arm.com> | 2020-08-31 16:05:39 +0000 |
| commit | 33a626f14c8db13967ba2a933388223d5bf733c3 (patch) | |
| tree | 109319777c0f638be639d7d723a417abe97d843c /src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp | |
| parent | 826a543547f325bfac7da507d19a55af9c138a50 (diff) | |
| download | armnn-33a626f14c8db13967ba2a933388223d5bf733c3.tar.gz | |
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
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp')
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp index 79eb2e4419..ec5bfb0396 100644 --- a/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/ElementwiseTestImpl.hpp @@ -51,6 +51,7 @@ LayerTestResult<TOutput, NumDims> ElementwiseTestHelper( int quantOffset1, const unsigned int outShape[NumDims], std::vector<TOutput> outValues, + const armnn::ITensorHandleFactory& tensorHandleFactory, float outQuantScale, int outQuantOffset) { @@ -77,11 +78,9 @@ LayerTestResult<TOutput, NumDims> ElementwiseTestHelper( ret.compareBoolean = true; } - ARMNN_NO_DEPRECATE_WARN_BEGIN - std::unique_ptr<armnn::ITensorHandle> inputHandle0 = workloadFactory.CreateTensorHandle(inputTensorInfo0); - std::unique_ptr<armnn::ITensorHandle> inputHandle1 = workloadFactory.CreateTensorHandle(inputTensorInfo1); - std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - ARMNN_NO_DEPRECATE_WARN_END + std::unique_ptr<armnn::ITensorHandle> inputHandle0 = tensorHandleFactory.CreateTensorHandle(inputTensorInfo0); + std::unique_ptr<armnn::ITensorHandle> inputHandle1 = tensorHandleFactory.CreateTensorHandle(inputTensorInfo1); + std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputTensorInfo); Descriptor data; armnn::WorkloadInfo info; @@ -123,6 +122,7 @@ LayerTestResult<T, NumDims> ElementwiseTestHelper( int quantOffset1, const unsigned int outShape[NumDims], std::vector<T> outValues, + const armnn::ITensorHandleFactory& tensorHandleFactory, float outQuantScale, int outQuantOffset) { @@ -139,6 +139,7 @@ LayerTestResult<T, NumDims> ElementwiseTestHelper( quantOffset1, outShape, outValues, + tensorHandleFactory, outQuantScale, outQuantOffset); } @@ -158,6 +159,7 @@ LayerTestResult<TOutput, NumDims> ElementwiseTestHelper( std::vector<TInput> values1, const unsigned int outShape[NumDims], std::vector<TOutput> outValues, + const armnn::ITensorHandleFactory& tensorHandleFactory, float quantScale = 1.0f, int quantOffset = 0) { @@ -174,6 +176,7 @@ LayerTestResult<TOutput, NumDims> ElementwiseTestHelper( quantOffset, outShape, outValues, + tensorHandleFactory, quantScale, quantOffset); } @@ -191,6 +194,7 @@ LayerTestResult<T, NumDims> ElementwiseTestHelper( std::vector<T> values1, const unsigned int outShape[NumDims], std::vector<T> outValues, + const armnn::ITensorHandleFactory& tensorHandleFactory, float quantScale = 1.0f, int quantOffset = 0) { @@ -203,6 +207,7 @@ LayerTestResult<T, NumDims> ElementwiseTestHelper( values1, outShape, outValues, + tensorHandleFactory, quantScale, quantOffset); }
\ No newline at end of file |