Commit 0e70363f authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #13882 from dkurt:fix_13479

parents 7baa5efb bfd663c2
...@@ -1217,12 +1217,8 @@ public: ...@@ -1217,12 +1217,8 @@ public:
int dims[] = {inputs[0][0], outCn, outH, outW}; int dims[] = {inputs[0][0], outCn, outH, outW};
outputs.resize(inputs.size(), shape(dims, 4)); outputs.resize(inputs.size(), shape(dims, 4));
internals.push_back(MatShape());
if (!is1x1()) if (!is1x1())
internals[0] = computeColRowShape(inputs[0], outputs[0]); internals.push_back(computeColRowShape(inputs[0], outputs[0]));
if (hasBias())
internals.push_back(shape(1, outH*outW));
return false; return false;
} }
......
...@@ -584,7 +584,7 @@ void ONNXImporter::populateNet(Net dstNet) ...@@ -584,7 +584,7 @@ void ONNXImporter::populateNet(Net dstNet)
for (int j = 1; j < node_proto.input_size(); j++) { for (int j = 1; j < node_proto.input_size(); j++) {
layerParams.blobs.push_back(getBlob(node_proto, constBlobs, j)); layerParams.blobs.push_back(getBlob(node_proto, constBlobs, j));
} }
layerParams.set("num_output", layerParams.blobs[0].size[1]); layerParams.set("num_output", layerParams.blobs[0].size[1] * layerParams.get<int>("group", 1));
layerParams.set("bias_term", node_proto.input_size() == 3); layerParams.set("bias_term", node_proto.input_size() == 3);
} }
else if (layer_type == "Transpose") else if (layer_type == "Transpose")
......
...@@ -72,6 +72,7 @@ TEST_P(Test_ONNX_layers, Deconvolution) ...@@ -72,6 +72,7 @@ TEST_P(Test_ONNX_layers, Deconvolution)
{ {
testONNXModels("deconvolution"); testONNXModels("deconvolution");
testONNXModels("two_deconvolution"); testONNXModels("two_deconvolution");
testONNXModels("deconvolution_group");
} }
TEST_P(Test_ONNX_layers, Dropout) TEST_P(Test_ONNX_layers, Dropout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment