potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-02-21 20:14:09 +00:00
parent 1d0334fc07 98c2ccfaa3
commit 0a6f216f83
28 changed files with 104 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/darknet/darknet_io.cpp
+4
View File
@@ -241,6 +241,10 @@ namespace cv {
{
activation_param.type = "Sigmoid";
}
else if (type == "tanh")
{
activation_param.type = "TanH";
}
else
{
CV_Error(cv::Error::StsParseError, "Unsupported activation: " + type);
modules/dnn/src/layers/proposal_layer.cpp
+2 -2
View File
@@ -54,11 +54,11 @@ public:
for (int i = 0; i < ratios.size(); ++i)
{
float ratio = ratios.get<float>(i);
float width = std::floor(baseSize / sqrt(ratio) + 0.5f);
float height = std::floor(width * ratio + 0.5f);
for (int j = 0; j < scales.size(); ++j)
{
float scale = scales.get<float>(j);
float width = std::floor(baseSize / sqrt(ratio) + 0.5f);
float height = std::floor(width * ratio + 0.5f);
widths.push_back(scale * width);
heights.push_back(scale * height);
}
modules/dnn/test/test_darknet_importer.cpp
+5
View File
@@ -735,6 +735,11 @@ TEST_P(Test_Darknet_layers, mish)
testDarknetLayer("mish", true);
}
TEST_P(Test_Darknet_layers, tanh)
{
testDarknetLayer("tanh");
}
TEST_P(Test_Darknet_layers, avgpool_softmax)
{
testDarknetLayer("avgpool_softmax");