mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-24 14:06:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22448 from Ichini24:reshape-permutations-fix

Browse Source 
changed names of permutations if Reshpe is in NHWC
This commit is contained in:
Alexander Smorkalov 2022-09-13 09:24:56 +03:00 committed by GitHub
commit c2c8da2517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/dnn/src/tensorflow/tf_importer.cpp
View File

@ -1097,6 +1097,9 @@ void TFImporter::parseReshape(tensorflow::GraphDef& net, const tensorflow::NodeD
std::swap(*newShape.ptr<int32_t>(0, 1), *newShape.ptr<int32_t>(0, 2));
hasSwap = true;
}
bool changedType{false};
if (inpLayout == DATA_LAYOUT_NHWC)
{
if (newShapeSize >= 2 || newShape.at<int>(1) == 1)
@ -1110,23 +1113,28 @@ void TFImporter::parseReshape(tensorflow::GraphDef& net, const tensorflow::NodeD
else
{
inpLayout = DATA_LAYOUT_NHWC;
changedType = newShapeSize == 4 && !hasSwap;
}
}
}
layerParams.set("dim", DictValue::arrayInt<int*>(newShape.ptr<int>(), newShapeSize));
int id = dstNet.addLayer(name, "Reshape", layerParams);
layer_id[name] = id;
std::string setName = changedType ? name + "/realReshape" : name;
int id = dstNet.addLayer(setName, "Reshape", layerParams);
layer_id[setName] = id;
// one input only
connect(layer_id, dstNet, inpId, id, 0);
inpId = Pin(name);
inpId = Pin(setName);
if ((inpLayout == DATA_LAYOUT_NHWC || inpLayout == DATA_LAYOUT_UNKNOWN || inpLayout == DATA_LAYOUT_PLANAR) &&
newShapeSize == 4 && !hasSwap)
{
int order[] = {0, 3, 1, 2}; // Transform back to OpenCV's NCHW.
addPermuteLayer(order, name + "/nchw", inpId);
setName = changedType ? name : name + "/nchw";
addPermuteLayer(order, setName, inpId);
inpLayout = DATA_LAYOUT_NCHW;
}

6
modules/dnn/test/test_tf_importer.cpp
View File

@ -337,6 +337,12 @@ TEST_P(Test_TensorFlow_layers, eltwise_mul_vec)
runTensorFlowNet("eltwise_mul_vec");
}
TEST_P(Test_TensorFlow_layers, tf_reshape_nhwc)
{
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
runTensorFlowNet("tf_reshape_nhwc");
}
TEST_P(Test_TensorFlow_layers, channel_broadcast)
{