potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #20605 from rogday:split_slice_shenanigans

Browse Source 
Add Normalize subgraph, fix Slice, Mul and Expand

* Add Normalize subgraph, support for starts<0 and axis<0 in Slice, Mul broadcasting in the middle and fix Expand's unsqueeze

* remove todos

* remove range-based for loop

* address review comments

* change >> to > > in template

* fix indexation

* fix expand that does nothing
This commit is contained in:
rogday
2021-09-09 14:41:40 +03:00
committed by GitHub
parent 1e0d290f2e
commit 4807cd8a6e
4 changed files with 173 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/test/test_onnx_importer.cpp
+6
View File
@@ -285,6 +285,7 @@ TEST_P(Test_ONNX_layers, Scale)
applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
testONNXModels("scale");
testONNXModels("scale_broadcast", npy, 0, 0, false, true, 3);
testONNXModels("scale_broadcast_mid", npy, 0, 0, false, true, 2);
}
TEST_P(Test_ONNX_layers, ReduceMean3D)
@@ -471,6 +472,8 @@ TEST_P(Test_ONNX_layers, MatMulAdd)
TEST_P(Test_ONNX_layers, Expand)
{
testONNXModels("expand");
testONNXModels("expand_identity");
testONNXModels("expand_batch");
testONNXModels("expand_channels");
testONNXModels("expand_neg_batch");
@@ -611,6 +614,7 @@ TEST_P(Test_ONNX_layers, ReduceL2)
testONNXModels("reduceL2");
testONNXModels("reduceL2_subgraph");
testONNXModels("reduceL2_subgraph_2");
testONNXModels("reduceL2_subgraph2_2");
}
TEST_P(Test_ONNX_layers, Split)
@@ -624,6 +628,7 @@ TEST_P(Test_ONNX_layers, Split)
testONNXModels("split_3");
testONNXModels("split_4");
testONNXModels("split_sizes");
testONNXModels("split_neg_axis");
}
TEST_P(Test_ONNX_layers, Slice)
@@ -632,6 +637,7 @@ TEST_P(Test_ONNX_layers, Slice)
testONNXModels("slice", npy, 0, 0, false, false);
#else
testONNXModels("slice");
testONNXModels("slice_neg_starts");
testONNXModels("slice_opset_11");
#endif
}