mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16424 from czgdp1807:issue-16370

Browse Source 
* fixed Split layer in ONNXImporter

* added test for fix of split layer

* fixed tests for Split layer

* applied reviews

* updated tests

* fixed paths in tests
This commit is contained in:
Gagandeep Singh 2020-02-15 16:42:20 +05:30 committed by GitHub
parent a8c257cecb
commit a6f3a21256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/dnn/src/onnx/onnx_importer.cpp
View File

@ -485,16 +485,23 @@ void ONNXImporter::populateNet(Net dstNet)
} }
else if (layer_type == "Split") else if (layer_type == "Split")
{ {
DictValue splits = layerParams.get("split"); if (layerParams.has("split"))
const int numSplits = splits.size();
CV_Assert(numSplits > 1);
std::vector<int> slicePoints(numSplits - 1, splits.get<int>(0));
for (int i = 1; i < splits.size() - 1; ++i)
{ {
slicePoints[i] = slicePoints[i - 1] + splits.get<int>(i - 1); DictValue splits = layerParams.get("split");
const int numSplits = splits.size();
CV_Assert(numSplits > 1);
std::vector<int> slicePoints(numSplits - 1, splits.get<int>(0));
for (int i = 1; i < splits.size() - 1; ++i)
{
slicePoints[i] = slicePoints[i - 1] + splits.get<int>(i - 1);
}
layerParams.set("slice_point", DictValue::arrayInt(&slicePoints[0], slicePoints.size()));
}
else
{
layerParams.set("num_split", node_proto.output_size());
} }
layerParams.set("slice_point", DictValue::arrayInt(&slicePoints[0], slicePoints.size()));
layerParams.type = "Slice"; layerParams.type = "Slice";
} }
else if (layer_type == "Add" || layer_type == "Sum") else if (layer_type == "Add" || layer_type == "Sum")

12
modules/dnn/test/test_onnx_importer.cpp
View File

@ -386,6 +386,18 @@ TEST_P(Test_ONNX_layers, ReduceL2)
testONNXModels("reduceL2"); testONNXModels("reduceL2");
} }
TEST_P(Test_ONNX_layers, Split)
{
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH)
applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);
testONNXModels("split_1");
testONNXModels("split_2");
testONNXModels("split_3");
testONNXModels("split_4");
}
TEST_P(Test_ONNX_layers, Slice) TEST_P(Test_ONNX_layers, Slice)
{ {
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_LT(2019010000) #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_LT(2019010000)