Skip to content

Commit d68466b

Browse files
committed
Merge pull request opencv#10940 from dkurt:dnn_tf_graph_optim
2 parents ab110c0 + ab20d2a commit d68466b

File tree

5 files changed

+696
-134
lines changed

5 files changed

+696
-134
lines changed

modules/dnn/src/layers/batch_norm_layer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class BatchNormLayerImpl : public BatchNormLayer
3232
BatchNormLayerImpl(const LayerParams& params)
3333
{
3434
setParamsFrom(params);
35-
CV_Assert(blobs.size() >= 3);
35+
CV_Assert(blobs.size() >= 2);
3636

3737
hasWeights = params.get<bool>("has_weight", false);
3838
hasBias = params.get<bool>("has_bias", false);
@@ -46,8 +46,8 @@ class BatchNormLayerImpl : public BatchNormLayer
4646
blobs[0].type() == CV_32F && blobs[1].type() == CV_32F);
4747

4848
float varMeanScale = 1.f;
49-
if (!hasWeights && !hasBias) {
50-
CV_Assert(blobs[2].type() == CV_32F);
49+
if (!hasWeights && !hasBias && blobs.size() > 2) {
50+
CV_Assert(blobs.size() == 3, blobs[2].type() == CV_32F);
5151
varMeanScale = blobs[2].at<float>(0);
5252
if (varMeanScale != 0)
5353
varMeanScale = 1/varMeanScale;

0 commit comments

Comments
 (0)