Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
6fc85586
Commit
6fc85586
authored
Sep 11, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnn(test): fix failures of 32-bit builders
parent
f4b9acb4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+9
-1
ts.hpp
modules/ts/include/opencv2/ts.hpp
+12
-0
No files found.
modules/dnn/test/test_onnx_importer.cpp
View file @
6fc85586
...
...
@@ -210,7 +210,11 @@ TEST_P(Test_ONNX_nets, RCNN_ILSVRC13)
testONNXModels
(
"rcnn_ilsvrc13"
,
pb
);
}
#ifdef OPENCV_32BIT_CONFIGURATION
TEST_P
(
Test_ONNX_nets
,
DISABLED_VGG16
)
// memory usage >2Gb
#else
TEST_P
(
Test_ONNX_nets
,
VGG16
)
#endif
{
double
l1
=
default_l1
;
double
lInf
=
default_lInf
;
...
...
@@ -225,7 +229,11 @@ TEST_P(Test_ONNX_nets, VGG16)
testONNXModels
(
"vgg16"
,
pb
,
l1
,
lInf
);
}
#ifdef OPENCV_32BIT_CONFIGURATION
TEST_P
(
Test_ONNX_nets
,
DISABLED_VGG16_bn
)
// memory usage >2Gb
#else
TEST_P
(
Test_ONNX_nets
,
VGG16_bn
)
#endif
{
double
l1
=
default_l1
;
double
lInf
=
default_lInf
;
...
...
@@ -288,7 +296,7 @@ TEST_P(Test_ONNX_nets, CNN_MNIST)
{
// output range: [-1952; 6574]
const
double
l1
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
3.82
:
4.3e-4
;
const
double
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
13.5
:
1
e-3
;
const
double
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
13.5
:
2
e-3
;
testONNXModels
(
"cnn_mnist"
,
pb
,
l1
,
lInf
);
}
...
...
modules/ts/include/opencv2/ts.hpp
View file @
6fc85586
...
...
@@ -37,6 +37,18 @@
#include <algorithm>
#ifndef OPENCV_32BIT_CONFIGURATION
# if defined(INTPTR_MAX) && defined(INT32_MAX) && INTPTR_MAX == INT32_MAX
# define OPENCV_32BIT_CONFIGURATION 1
# elif defined(_WIN32) && !defined(_WIN64)
# define OPENCV_32BIT_CONFIGURATION 1
# endif
#else
# if OPENCV_32BIT_CONFIGURATION == 0
# undef OPENCV_32BIT_CONFIGURATION
# endif
#endif
#ifdef WINRT
#pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment