mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove flag of convolution

Browse Source
This commit is contained in:
zihaomu 2023-05-16 15:29:20 +08:00
parent 233478e689
commit 91b6c8507a
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/include/opencv2/dnn/all_layers.hpp
View File

@ -258,7 +258,6 @@ CV__DNN_INLINE_NS_BEGIN
static Ptr<BaseConvolutionLayer> create(const LayerParams& params); static Ptr<BaseConvolutionLayer> create(const LayerParams& params);
bool fusedActivation = false; bool fusedActivation = false;
bool fusedAdd = false; bool fusedAdd = false;
bool isConv2D = false; // Should be deleted after fastconv branch support Conv1D and Conv3D.
bool useWinograd = false; // Flag whether to use Winograd to speed up 3x3 convolution. bool useWinograd = false; // Flag whether to use Winograd to speed up 3x3 convolution.
}; };

3
modules/dnn/src/layers/convolution_layer.cpp
View File

@ -116,9 +116,6 @@ public:
fusedWeights = false; fusedWeights = false;
fusedBias = false; fusedBias = false;
if (kernel_size.size() == 2)
isConv2D = true;
} }
virtual void finalize(InputArrayOfArrays inputs_arr, OutputArrayOfArrays outputs_arr) CV_OVERRIDE virtual void finalize(InputArrayOfArrays inputs_arr, OutputArrayOfArrays outputs_arr) CV_OVERRIDE

4
modules/dnn/src/net_impl_fuse.cpp
View File

@ -170,8 +170,8 @@ void Net::Impl::fuseLayers(const std::vector<LayerPin>& blobsToKeep_)
// To avoid the order like: conv + activ + add, if we found the conv has been fused with activ, we break. // To avoid the order like: conv + activ + add, if we found the conv has been fused with activ, we break.
Ptr<ConvolutionLayer> convLayer = ld.layerInstance.dynamicCast<ConvolutionLayer>(); Ptr<ConvolutionLayer> convLayer = ld.layerInstance.dynamicCast<ConvolutionLayer>();
// Only Conv2D without fusion Activation supports this fusion, other-wise, we skip. // Only Convolution layer without fusion Activation supports this fusion, other-wise, we skip.
if (!convLayer->isConv2D || convLayer->fusedActivation) if (convLayer->fusedActivation)
break; break;
// For now, there are currently two layers in OpenCV that run the Add operator. // For now, there are currently two layers in OpenCV that run the Add operator.