potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53: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
2018-06-17 16:26:48 +03:00
parent 0d6518aaa0 eed43a231b
commit 64f2b1b250
9 changed files with 137 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/test/test_darknet_importer.cpp
+5
View File
@@ -228,4 +228,9 @@ TEST(Test_Darknet, upsample)
testDarknetLayer("upsample");
}
TEST(Test_Darknet, avgpool_softmax)
{
testDarknetLayer("avgpool_softmax");
}
}} // namespace
modules/dnn/test/test_tf_importer.cpp
+1
View File
@@ -415,6 +415,7 @@ TEST(Test_TensorFlow, softmax)
TEST(Test_TensorFlow, relu6)
{
runTensorFlowNet("keras_relu6");
runTensorFlowNet("keras_relu6", DNN_TARGET_CPU, /*hasText*/ true);
}
TEST(Test_TensorFlow, keras_mobilenet_head)