diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-01 19:01:44 +0100 |
---|---|---|
committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-07-02 13:50:24 +0000 |
commit | 169d2f120cc9021f170fede22a448fd6b66fc979 (patch) | |
tree | a55b62678a85f63c074148d33fae744b22c834a8 /src/armnn/test/OptimizerTests.cpp | |
parent | 38e05bd2836b1b65b440330a9c283038ba4192c3 (diff) | |
download | armnn-169d2f120cc9021f170fede22a448fd6b66fc979.tar.gz |
IVGCVSW-3382 Deprecate ResizeBilinear and use Resize with Bilinear method
!android-nn-driver:1451
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ieedbce1f6e95891137a250fdd07e2f7e4e1f4828
Diffstat (limited to 'src/armnn/test/OptimizerTests.cpp')
-rw-r--r-- | src/armnn/test/OptimizerTests.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp index 97bd8de651..b06403c8d6 100644 --- a/src/armnn/test/OptimizerTests.cpp +++ b/src/armnn/test/OptimizerTests.cpp @@ -953,18 +953,19 @@ BOOST_AUTO_TEST_CASE(Pooling2dValidateTensorShapesFromInputsNhwc) void CreateResizeBilinearGraph(Graph &graph, const unsigned int* inputShape, const unsigned int* outputShape, DataLayout dataLayout = DataLayout::NCHW) { - armnn::TensorInfo inputInfo(4, inputShape, DataType::Float32); - armnn::TensorInfo outputInfo(4, outputShape, DataType::Float32); + TensorInfo inputInfo(4, inputShape, DataType::Float32); + TensorInfo outputInfo(4, outputShape, DataType::Float32); - ResizeBilinearDescriptor desc; + ResizeDescriptor desc; + desc.m_Method = ResizeMethod::Bilinear; desc.m_TargetHeight = 3; - desc.m_TargetWidth = 4; - desc.m_DataLayout = dataLayout; + desc.m_TargetWidth = 4; + desc.m_DataLayout = dataLayout; Layer* input = graph.AddLayer<InputLayer>(0, "input"); input->GetOutputSlot().SetTensorInfo(inputInfo); - ResizeBilinearLayer* layer = graph.AddLayer<ResizeBilinearLayer>(desc, "resizeBilinear"); + ResizeLayer* layer = graph.AddLayer<ResizeLayer>(desc, "resizeBilinear"); layer->GetOutputSlot().SetTensorInfo(outputInfo); Layer* output = graph.AddLayer<OutputLayer>(0, "output"); |