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
38a3c1ce
Commit
38a3c1ce
authored
May 27, 2019
by
Alexander Alekhin
Committed by
Alexander Alekhin
May 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnn(test): update test tags for Debug build
parent
483e9f34
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
12 deletions
+49
-12
test_backends.cpp
modules/dnn/test/test_backends.cpp
+10
-2
test_caffe_importer.cpp
modules/dnn/test/test_caffe_importer.cpp
+23
-5
test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+5
-2
test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+11
-3
No files found.
modules/dnn/test/test_backends.cpp
View file @
38a3c1ce
...
@@ -110,7 +110,10 @@ TEST_P(DNNTestNetwork, AlexNet)
...
@@ -110,7 +110,10 @@ TEST_P(DNNTestNetwork, AlexNet)
TEST_P
(
DNNTestNetwork
,
ResNet_50
)
TEST_P
(
DNNTestNetwork
,
ResNet_50
)
{
{
applyTestTag
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
),
CV_TEST_TAG_DEBUG_LONG
);
processNet
(
"dnn/ResNet-50-model.caffemodel"
,
"dnn/ResNet-50-deploy.prototxt"
,
processNet
(
"dnn/ResNet-50-model.caffemodel"
,
"dnn/ResNet-50-deploy.prototxt"
,
Size
(
224
,
224
),
"prob"
,
Size
(
224
,
224
),
"prob"
,
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_resnet_50.yml"
:
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_resnet_50.yml"
:
...
@@ -344,7 +347,10 @@ TEST_P(DNNTestNetwork, opencv_face_detector)
...
@@ -344,7 +347,10 @@ TEST_P(DNNTestNetwork, opencv_face_detector)
TEST_P
(
DNNTestNetwork
,
Inception_v2_SSD_TensorFlow
)
TEST_P
(
DNNTestNetwork
,
Inception_v2_SSD_TensorFlow
)
{
{
applyTestTag
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
),
CV_TEST_TAG_DEBUG_LONG
);
#if defined(INF_ENGINE_RELEASE)
#if defined(INF_ENGINE_RELEASE)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
&&
getInferenceEngineVPUType
()
==
CV_DNN_INFERENCE_ENGINE_VPU_TYPE_MYRIAD_X
)
&&
getInferenceEngineVPUType
()
==
CV_DNN_INFERENCE_ENGINE_VPU_TYPE_MYRIAD_X
)
...
@@ -382,6 +388,8 @@ TEST_P(DNNTestNetwork, DenseNet_121)
...
@@ -382,6 +388,8 @@ TEST_P(DNNTestNetwork, DenseNet_121)
TEST_P
(
DNNTestNetwork
,
FastNeuralStyle_eccv16
)
TEST_P
(
DNNTestNetwork
,
FastNeuralStyle_eccv16
)
{
{
applyTestTag
(
CV_TEST_TAG_MEMORY_512MB
,
CV_TEST_TAG_DEBUG_VERYLONG
);
if
(
backend
==
DNN_BACKEND_HALIDE
||
if
(
backend
==
DNN_BACKEND_HALIDE
||
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
throw
SkipTestException
(
""
);
throw
SkipTestException
(
""
);
...
...
modules/dnn/test/test_caffe_importer.cpp
View file @
38a3c1ce
...
@@ -114,6 +114,9 @@ TEST_P(Reproducibility_AlexNet, Accuracy)
...
@@ -114,6 +114,9 @@ TEST_P(Reproducibility_AlexNet, Accuracy)
{
{
Target
targetId
=
get
<
1
>
(
GetParam
());
Target
targetId
=
get
<
1
>
(
GetParam
());
applyTestTag
(
targetId
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
targetId
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
if
(
!
ocl
::
useOpenCL
()
&&
targetId
!=
DNN_TARGET_CPU
)
throw
SkipTestException
(
"OpenCL is disabled"
);
bool
readFromMemory
=
get
<
0
>
(
GetParam
());
bool
readFromMemory
=
get
<
0
>
(
GetParam
());
Net
net
;
Net
net
;
{
{
...
@@ -154,7 +157,8 @@ INSTANTIATE_TEST_CASE_P(/**/, Reproducibility_AlexNet, Combine(testing::Bool(),
...
@@ -154,7 +157,8 @@ INSTANTIATE_TEST_CASE_P(/**/, Reproducibility_AlexNet, Combine(testing::Bool(),
TEST
(
Reproducibility_FCN
,
Accuracy
)
TEST
(
Reproducibility_FCN
,
Accuracy
)
{
{
applyTestTag
(
CV_TEST_TAG_LONG
,
CV_TEST_TAG_MEMORY_2GB
);
applyTestTag
(
CV_TEST_TAG_LONG
,
CV_TEST_TAG_DEBUG_VERYLONG
,
CV_TEST_TAG_MEMORY_2GB
);
Net
net
;
Net
net
;
{
{
const
string
proto
=
findDataFile
(
"dnn/fcn8s-heavy-pascal.prototxt"
,
false
);
const
string
proto
=
findDataFile
(
"dnn/fcn8s-heavy-pascal.prototxt"
,
false
);
...
@@ -183,7 +187,7 @@ TEST(Reproducibility_FCN, Accuracy)
...
@@ -183,7 +187,7 @@ TEST(Reproducibility_FCN, Accuracy)
TEST
(
Reproducibility_SSD
,
Accuracy
)
TEST
(
Reproducibility_SSD
,
Accuracy
)
{
{
applyTestTag
(
CV_TEST_TAG_MEMORY_512MB
);
applyTestTag
(
CV_TEST_TAG_MEMORY_512MB
,
CV_TEST_TAG_DEBUG_LONG
);
Net
net
;
Net
net
;
{
{
const
string
proto
=
findDataFile
(
"dnn/ssd_vgg16.prototxt"
,
false
);
const
string
proto
=
findDataFile
(
"dnn/ssd_vgg16.prototxt"
,
false
);
...
@@ -281,6 +285,9 @@ TEST_P(Reproducibility_ResNet50, Accuracy)
...
@@ -281,6 +285,9 @@ TEST_P(Reproducibility_ResNet50, Accuracy)
{
{
Target
targetId
=
GetParam
();
Target
targetId
=
GetParam
();
applyTestTag
(
targetId
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
targetId
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
if
(
!
ocl
::
useOpenCL
()
&&
targetId
!=
DNN_TARGET_CPU
)
throw
SkipTestException
(
"OpenCL is disabled"
);
Net
net
=
readNetFromCaffe
(
findDataFile
(
"dnn/ResNet-50-deploy.prototxt"
,
false
),
Net
net
=
readNetFromCaffe
(
findDataFile
(
"dnn/ResNet-50-deploy.prototxt"
,
false
),
findDataFile
(
"dnn/ResNet-50-model.caffemodel"
,
false
));
findDataFile
(
"dnn/ResNet-50-model.caffemodel"
,
false
));
...
@@ -541,7 +548,11 @@ INSTANTIATE_TEST_CASE_P(Test_Caffe, opencv_face_detector,
...
@@ -541,7 +548,11 @@ INSTANTIATE_TEST_CASE_P(Test_Caffe, opencv_face_detector,
TEST_P
(
Test_Caffe_nets
,
FasterRCNN_vgg16
)
TEST_P
(
Test_Caffe_nets
,
FasterRCNN_vgg16
)
{
{
applyTestTag
(
CV_TEST_TAG_LONG
,
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_1GB
:
CV_TEST_TAG_MEMORY_2GB
));
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_1GB
:
CV_TEST_TAG_MEMORY_2GB
),
CV_TEST_TAG_LONG
,
CV_TEST_TAG_DEBUG_VERYLONG
);
#if defined(INF_ENGINE_RELEASE)
#if defined(INF_ENGINE_RELEASE)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_OPENCL_FP16
))
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_OPENCL_FP16
))
...
@@ -559,7 +570,10 @@ TEST_P(Test_Caffe_nets, FasterRCNN_vgg16)
...
@@ -559,7 +570,10 @@ TEST_P(Test_Caffe_nets, FasterRCNN_vgg16)
TEST_P
(
Test_Caffe_nets
,
FasterRCNN_zf
)
TEST_P
(
Test_Caffe_nets
,
FasterRCNN_zf
)
{
{
applyTestTag
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
),
CV_TEST_TAG_DEBUG_LONG
);
if
((
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL_FP16
)
||
if
((
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL_FP16
)
||
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
throw
SkipTestException
(
""
);
throw
SkipTestException
(
""
);
...
@@ -571,7 +585,11 @@ TEST_P(Test_Caffe_nets, FasterRCNN_zf)
...
@@ -571,7 +585,11 @@ TEST_P(Test_Caffe_nets, FasterRCNN_zf)
TEST_P
(
Test_Caffe_nets
,
RFCN
)
TEST_P
(
Test_Caffe_nets
,
RFCN
)
{
{
applyTestTag
(
CV_TEST_TAG_LONG
,
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_2GB
));
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_2GB
),
CV_TEST_TAG_LONG
,
CV_TEST_TAG_DEBUG_VERYLONG
);
if
((
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL_FP16
)
||
if
((
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL_FP16
)
||
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
throw
SkipTestException
(
""
);
throw
SkipTestException
(
""
);
...
...
modules/dnn/test/test_onnx_importer.cpp
View file @
38a3c1ce
...
@@ -343,7 +343,7 @@ TEST_P(Test_ONNX_nets, VGG16_bn)
...
@@ -343,7 +343,7 @@ TEST_P(Test_ONNX_nets, VGG16_bn)
TEST_P
(
Test_ONNX_nets
,
ZFNet
)
TEST_P
(
Test_ONNX_nets
,
ZFNet
)
{
{
applyTestTag
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1
GB
);
applyTestTag
(
CV_TEST_TAG_MEMORY_2
GB
);
testONNXModels
(
"zfnet512"
,
pb
);
testONNXModels
(
"zfnet512"
,
pb
);
}
}
...
@@ -418,7 +418,10 @@ TEST_P(Test_ONNX_nets, MobileNet_v2)
...
@@ -418,7 +418,10 @@ TEST_P(Test_ONNX_nets, MobileNet_v2)
TEST_P
(
Test_ONNX_nets
,
LResNet100E_IR
)
TEST_P
(
Test_ONNX_nets
,
LResNet100E_IR
)
{
{
applyTestTag
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
),
CV_TEST_TAG_DEBUG_LONG
);
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_MYRIAD
))
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_MYRIAD
))
throw
SkipTestException
(
""
);
throw
SkipTestException
(
""
);
...
...
modules/dnn/test/test_tf_importer.cpp
View file @
38a3c1ce
...
@@ -437,7 +437,12 @@ TEST_P(Test_TensorFlow_nets, MobileNet_v1_SSD)
...
@@ -437,7 +437,12 @@ TEST_P(Test_TensorFlow_nets, MobileNet_v1_SSD)
TEST_P
(
Test_TensorFlow_nets
,
Faster_RCNN
)
TEST_P
(
Test_TensorFlow_nets
,
Faster_RCNN
)
{
{
applyTestTag
(
CV_TEST_TAG_LONG
,
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_1GB
:
CV_TEST_TAG_MEMORY_2GB
));
// FIXIT split test
// FIXIT split test
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_1GB
:
CV_TEST_TAG_MEMORY_2GB
),
CV_TEST_TAG_LONG
,
CV_TEST_TAG_DEBUG_VERYLONG
);
static
std
::
string
names
[]
=
{
"faster_rcnn_inception_v2_coco_2018_01_28"
,
static
std
::
string
names
[]
=
{
"faster_rcnn_inception_v2_coco_2018_01_28"
,
"faster_rcnn_resnet50_coco_2018_01_28"
};
"faster_rcnn_resnet50_coco_2018_01_28"
};
...
@@ -535,7 +540,10 @@ TEST_P(Test_TensorFlow_nets, opencv_face_detector_uint8)
...
@@ -535,7 +540,10 @@ TEST_P(Test_TensorFlow_nets, opencv_face_detector_uint8)
// np.save('east_text_detection.geometry.npy', geometry)
// np.save('east_text_detection.geometry.npy', geometry)
TEST_P
(
Test_TensorFlow_nets
,
EAST_text_detection
)
TEST_P
(
Test_TensorFlow_nets
,
EAST_text_detection
)
{
{
applyTestTag
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
(
target
==
DNN_TARGET_CPU
?
CV_TEST_TAG_MEMORY_512MB
:
CV_TEST_TAG_MEMORY_1GB
),
CV_TEST_TAG_DEBUG_LONG
);
#if defined(INF_ENGINE_RELEASE)
#if defined(INF_ENGINE_RELEASE)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
)
...
@@ -765,7 +773,7 @@ TEST(Test_TensorFlow, two_inputs)
...
@@ -765,7 +773,7 @@ TEST(Test_TensorFlow, two_inputs)
TEST
(
Test_TensorFlow
,
Mask_RCNN
)
TEST
(
Test_TensorFlow
,
Mask_RCNN
)
{
{
applyTestTag
(
CV_TEST_TAG_MEMORY_1GB
);
applyTestTag
(
CV_TEST_TAG_MEMORY_1GB
,
CV_TEST_TAG_DEBUG_VERYLONG
);
std
::
string
proto
=
findDataFile
(
"dnn/mask_rcnn_inception_v2_coco_2018_01_28.pbtxt"
,
false
);
std
::
string
proto
=
findDataFile
(
"dnn/mask_rcnn_inception_v2_coco_2018_01_28.pbtxt"
,
false
);
std
::
string
model
=
findDataFile
(
"dnn/mask_rcnn_inception_v2_coco_2018_01_28.pb"
,
false
);
std
::
string
model
=
findDataFile
(
"dnn/mask_rcnn_inception_v2_coco_2018_01_28.pb"
,
false
);
...
...
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