mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-05 05:56:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2

Browse Source
This commit is contained in:
Alexander Alekhin 2018-06-29 15:02:22 +00:00
commit 9be3f7d41a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,8 @@ enum DataLayout
{ {
DATA_LAYOUT_NHWC, DATA_LAYOUT_NHWC,
DATA_LAYOUT_NCHW, DATA_LAYOUT_NCHW,
DATA_LAYOUT_UNKNOWN DATA_LAYOUT_UNKNOWN,
DATA_LAYOUT_PLANAR // 2-dimensional outputs (matmul, flatten, reshape to 2d)
}; };
typedef std::vector<std::pair<String, int> > StrIntVector; typedef std::vector<std::pair<String, int> > StrIntVector;
@ -948,7 +949,7 @@ void TFImporter::populateNet(Net dstNet)
// one input only // one input only
int input_blob_index = kernel_blob_index == 0 ? 1 : 0; int input_blob_index = kernel_blob_index == 0 ? 1 : 0;
connect(layer_id, dstNet, parsePin(layer.input(input_blob_index)), id, 0); connect(layer_id, dstNet, parsePin(layer.input(input_blob_index)), id, 0);
data_layouts[name] = DATA_LAYOUT_UNKNOWN; data_layouts[name] = DATA_LAYOUT_PLANAR;
} }
else if (type == "Reshape") else if (type == "Reshape")
{ {
@ -981,7 +982,7 @@ void TFImporter::populateNet(Net dstNet)
// one input only // one input only
connect(layer_id, dstNet, inpId, id, 0); connect(layer_id, dstNet, inpId, id, 0);
data_layouts[name] = DATA_LAYOUT_UNKNOWN; data_layouts[name] = newShape.total() == 2 ? DATA_LAYOUT_PLANAR : DATA_LAYOUT_UNKNOWN;
} }
else if (type == "Flatten" || type == "Squeeze") else if (type == "Flatten" || type == "Squeeze")
{ {
@ -1020,7 +1021,7 @@ void TFImporter::populateNet(Net dstNet)
int id = dstNet.addLayer(name, "Flatten", layerParams); int id = dstNet.addLayer(name, "Flatten", layerParams);
layer_id[name] = id; layer_id[name] = id;
connect(layer_id, dstNet, inpId, id, 0); connect(layer_id, dstNet, inpId, id, 0);
data_layouts[name] = DATA_LAYOUT_UNKNOWN; data_layouts[name] = DATA_LAYOUT_PLANAR;
} }
else if (type == "Transpose") else if (type == "Transpose")
{ {