Merge pull request opencv#9022 from dkurt:keep_conv_weights_for_halide

vpisarev · vpisarev · commit ac49a17a82a8 · 2017-06-29T11:09:17.000Z
diff --git a/modules/dnn/src/layers/convolution_layer.cpp b/modules/dnn/src/layers/convolution_layer.cpp
@@ -644,7 +644,7 @@ class ConvolutionLayerImpl : public BaseConvolutionLayerImpl
         {
             // prepare weightsMat where each row is aligned and has enough zero padding on the right to
             // use vectorized (i.e. with intrinsics) loops without tail processing
-            Mat wm = blobs[0].reshape(1, outCn);
+            Mat wm = blobs[0].reshape(1, outCn).clone();
             if( wm.step1() % VEC_ALIGN != 0 )
             {
                 int newcols = (int)alignSize(wm.step1(), VEC_ALIGN);

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ class ConvolutionLayerImpl : public BaseConvolutionLayerImpl`
`644`	`644`	`{`
`645`	`645`	`// prepare weightsMat where each row is aligned and has enough zero padding on the right to`
`646`	`646`	`// use vectorized (i.e. with intrinsics) loops without tail processing`
`647`		`- Mat wm = blobs[0].reshape(1, outCn);`
	`647`	`+ Mat wm = blobs[0].reshape(1, outCn).clone();`
`648`	`648`	`if( wm.step1() % VEC_ALIGN != 0 )`
`649`	`649`	`{`
`650`	`650`	`int newcols = (int)alignSize(wm.step1(), VEC_ALIGN);`