Merge pull request opencv#10244 from dkurt:issue_10239

alalek · alalek · commit 0be1bf551b73 · 2017-12-07T09:43:16.000Z
diff --git a/modules/dnn/perf/perf_net.cpp b/modules/dnn/perf/perf_net.cpp
@@ -87,6 +87,7 @@ class DNNTestNetwork : public ::perf::TestBaseWithParam< tuple<DNNBackend, DNNTa
         size_t weightsMemory = 0, blobsMemory = 0;
         net.getMemoryConsumption(netInputShape, weightsMemory, blobsMemory);
         int64 flops = net.getFLOPS(netInputShape);
+        CV_Assert(flops > 0);
 
         net.forward(outputLayer); // warmup
 
diff --git a/modules/dnn/src/layers/convolution_layer.cpp b/modules/dnn/src/layers/convolution_layer.cpp
@@ -1022,7 +1022,7 @@ class ConvolutionLayerImpl : public BaseConvolutionLayerImpl
         int64 flops = 0;
         for (int i = 0; i < inputs.size(); i++)
         {
-            flops += total(outputs[i])*(2*kernel.area()*inputs[i][1] + 1);
+            flops += total(outputs[i])*(CV_BIG_INT(2)*kernel.area()*inputs[i][1] + 1);
         }
 
         return flops;
@@ -1440,7 +1440,7 @@ class DeConvolutionLayerImpl : public BaseConvolutionLayerImpl
 
         for (int i = 0; i < inputs.size(); i++)
         {
-            flops += 2*outChannels*kernel.area()*total(inputs[i]);
+            flops += CV_BIG_INT(2)*outChannels*kernel.area()*total(inputs[i]);
         }
 
         return flops;
diff --git a/modules/dnn/src/layers/fully_connected_layer.cpp b/modules/dnn/src/layers/fully_connected_layer.cpp
@@ -397,7 +397,7 @@ class FullyConnectedLayerImpl : public InnerProductLayer
         int innerSize = blobs[0].size[1];
         for(int i = 0; i < outputs.size(); i++)
         {
-            flops += 3*innerSize*total(outputs[i]);
+            flops += CV_BIG_INT(3)*innerSize*total(outputs[i]);
         }
 
         return flops;

Original file line number	Diff line number	Diff line change
`@@ -1022,7 +1022,7 @@ class ConvolutionLayerImpl : public BaseConvolutionLayerImpl`
`1022`	`1022`	`int64 flops = 0;`
`1023`	`1023`	`for (int i = 0; i < inputs.size(); i++)`
`1024`	`1024`	`{`
`1025`		`- flops += total(outputs[i])(2kernel.area()*inputs[i][1] + 1);`
	`1025`	`+ flops += total(outputs[i])(CV_BIG_INT(2)kernel.area()*inputs[i][1] + 1);`
`1026`	`1026`	`}`
`1027`	`1027`
`1028`	`1028`	`return flops;`
`@@ -1440,7 +1440,7 @@ class DeConvolutionLayerImpl : public BaseConvolutionLayerImpl`
`1440`	`1440`
`1441`	`1441`	`for (int i = 0; i < inputs.size(); i++)`
`1442`	`1442`	`{`
`1443`		`- flops += 2outChannelskernel.area()*total(inputs[i]);`
	`1443`	`+ flops += CV_BIG_INT(2)outChannelskernel.area()*total(inputs[i]);`
`1444`	`1444`	`}`
`1445`	`1445`
`1446`	`1446`	`return flops;`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ class FullyConnectedLayerImpl : public InnerProductLayer`
`397`	`397`	`int innerSize = blobs[0].size[1];`
`398`	`398`	`for(int i = 0; i < outputs.size(); i++)`
`399`	`399`	`{`
`400`		`- flops += 3innerSizetotal(outputs[i]);`
	`400`	`+ flops += CV_BIG_INT(3)innerSizetotal(outputs[i]);`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`return flops;`