From 3fd5ac7e92049b4f31026acdb53a762289f71448 Mon Sep 17 00:00:00 2001 From: "Guo, Yejun" Date: Wed, 9 Oct 2019 22:08:11 +0800 Subject: avfilter/dnn: unify the layer execution function in native mode Signed-off-by: Guo, Yejun Signed-off-by: Pedro Arthur --- tests/dnn/dnn-layer-conv2d-test.c | 4 ++-- tests/dnn/dnn-layer-depth2space-test.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/dnn') diff --git a/tests/dnn/dnn-layer-conv2d-test.c b/tests/dnn/dnn-layer-conv2d-test.c index afc5391484..9d13da37c8 100644 --- a/tests/dnn/dnn-layer-conv2d-test.c +++ b/tests/dnn/dnn-layer-conv2d-test.c @@ -113,7 +113,7 @@ static int test_with_same_dilate(void) operands[1].data = NULL; input_indexes[0] = 0; - convolve(operands, input_indexes, 1, ¶ms); + dnn_execute_layer_conv2d(operands, input_indexes, 1, ¶ms); output = operands[1].data; for (int i = 0; i < sizeof(expected_output) / sizeof(float); i++) { @@ -212,7 +212,7 @@ static int test_with_valid(void) operands[1].data = NULL; input_indexes[0] = 0; - convolve(operands, input_indexes, 1, ¶ms); + dnn_execute_layer_conv2d(operands, input_indexes, 1, ¶ms); output = operands[1].data; for (int i = 0; i < sizeof(expected_output) / sizeof(float); i++) { diff --git a/tests/dnn/dnn-layer-depth2space-test.c b/tests/dnn/dnn-layer-depth2space-test.c index 87118de795..5225ec7b7a 100644 --- a/tests/dnn/dnn-layer-depth2space-test.c +++ b/tests/dnn/dnn-layer-depth2space-test.c @@ -48,6 +48,7 @@ static int test(void) print(list(output.flatten())) */ + DepthToSpaceParams params; DnnOperand operands[2]; int32_t input_indexes[1]; float input[1*5*3*4] = { @@ -79,7 +80,8 @@ static int test(void) operands[1].data = NULL; input_indexes[0] = 0; - depth_to_space(operands, input_indexes, 1, 2); + params.block_size = 2; + dnn_execute_layer_depth2space(operands, input_indexes, 1, ¶ms); output = operands[1].data; for (int i = 0; i < sizeof(expected_output) / sizeof(float); i++) { -- cgit v1.2.3