From 0690265d83e5aa79bd174544a7b35330781619dd Mon Sep 17 00:00:00 2001 From: Cathal Corbett Date: Thu, 14 Apr 2022 17:55:11 +0100 Subject: IVGCVSW-6127 ConstTensorsAsInput: DepthwiseConvolution2d !android-nn-driver:7418 * Update Front-end and Tools. * Updated Serializer, Deserializer and unit tests to reflect this. * Updated TfLiteDelegate, TfLiteParser and OnnxParser. * Change NNDriver to new API. * Updated Ref. * Neon and Cl backend partially completed (Backend.cpp files). * Added dynamic or constant input EndToEnd tests. * Added ConstantTensorAsInputMemeberVariableRedirect Optimization. Signed-off-by: Cathal Corbett Change-Id: Ib18b6c10a093042e165e25237dc04a4c67ba82da --- src/armnn/test/ShapeInferenceTests.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/armnn/test/ShapeInferenceTests.cpp') diff --git a/src/armnn/test/ShapeInferenceTests.cpp b/src/armnn/test/ShapeInferenceTests.cpp index 687462dfb5..d45c9900c0 100644 --- a/src/armnn/test/ShapeInferenceTests.cpp +++ b/src/armnn/test/ShapeInferenceTests.cpp @@ -331,18 +331,11 @@ TEST_CASE("DepthwiseConvolutionTest") descriptor.m_DataLayout = DataLayout::NHWC; descriptor.m_BiasEnabled = false; - Graph graph; - - auto layer = BuildGraph(&graph, - {{ 8, 16, 2, 1 }}, - descriptor, - "depthwiseconv2d"); - - const float Datum = 0.0f; - ConstTensor weights({{ 2, 5, 3, 2 }, DataType::Float32, 0.0f, 0, true}, &Datum); - layer->m_Weight = std::make_unique(weights); - - RunShapeInferenceTest(layer, {{ 8, 18, 1, 2 }}); + CreateGraphAndRunTest({{ 8, 16, 2, 1 }, // input + { 2, 5, 3, 2 }}, // weights + {{ 8, 18, 1, 2 }}, // output + descriptor, + "conv2d"); } TEST_CASE("DequantizeTest") -- cgit v1.2.1