From: Dmitry Kurtaev Date: Mon, 2 Oct 2017 19:44:42 +0000 (+0300) Subject: Fix TensorFlow split layer X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~545^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a21c1083728ab86a9bc54cf533665eb093eff96;p=platform%2Fupstream%2Fopencv.git Fix TensorFlow split layer --- diff --git a/modules/dnn/src/layers/slice_layer.cpp b/modules/dnn/src/layers/slice_layer.cpp index b824a06..c7db0f4 100644 --- a/modules/dnn/src/layers/slice_layer.cpp +++ b/modules/dnn/src/layers/slice_layer.cpp @@ -116,7 +116,7 @@ public: } else // Divide input blob on equal parts by axis. { - CV_Assert(0 < axis && axis < inpShape.size()); + CV_Assert(0 <= axis && axis < inpShape.size()); CV_Assert(requiredOutputs > 0 && inpShape[axis] % requiredOutputs == 0); inpShape[axis] /= requiredOutputs; outputs.resize(requiredOutputs, inpShape); diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index 55d9fd2..3065a1f 100644 --- a/modules/dnn/src/tensorflow/tf_importer.cpp +++ b/modules/dnn/src/tensorflow/tf_importer.cpp @@ -866,8 +866,6 @@ void TFImporter::populateNet(Net dstNet) CV_Assert(layer.input_size() == 2); // num_split // 1st blob is dims tensor - layerParams.set("slice_point", DictValue::arrayReal((double*)0, 0)); - int axis = getConstBlob(layer, value_id, 0).int_val().Get(0); layerParams.set("axis", toNCHW[axis]); diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp index f382507..3f89dd4 100644 --- a/modules/dnn/test/test_tf_importer.cpp +++ b/modules/dnn/test/test_tf_importer.cpp @@ -170,4 +170,9 @@ TEST(Test_TensorFlow, lstm) runTensorFlowNet("lstm"); } +TEST(Test_TensorFlow, split) +{ + runTensorFlowNet("split_equals"); +} + }