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
163d5e4d
Commit
163d5e4d
authored
Apr 30, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14368 from dkurt:dnn_ie_tests
parents
bc989379
4f6be11c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
66 additions
and
9 deletions
+66
-9
lrn_layer.cpp
modules/dnn/src/layers/lrn_layer.cpp
+1
-1
test_backends.cpp
modules/dnn/test/test_backends.cpp
+20
-2
test_caffe_importer.cpp
modules/dnn/test/test_caffe_importer.cpp
+2
-0
test_common.hpp
modules/dnn/test/test_common.hpp
+25
-0
test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+12
-6
test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+6
-0
No files found.
modules/dnn/src/layers/lrn_layer.cpp
View file @
163d5e4d
...
@@ -91,7 +91,7 @@ public:
...
@@ -91,7 +91,7 @@ public:
virtual
bool
supportBackend
(
int
backendId
)
CV_OVERRIDE
virtual
bool
supportBackend
(
int
backendId
)
CV_OVERRIDE
{
{
if
(
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
)
if
(
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
)
return
bias
==
1
;
return
bias
==
(
int
)
bias
;
return
backendId
==
DNN_BACKEND_OPENCV
||
backendId
==
DNN_BACKEND_HALIDE
;
return
backendId
==
DNN_BACKEND_OPENCV
||
backendId
==
DNN_BACKEND_HALIDE
;
}
}
...
...
modules/dnn/test/test_backends.cpp
View file @
163d5e4d
...
@@ -45,7 +45,7 @@ public:
...
@@ -45,7 +45,7 @@ public:
netDefault
.
setInput
(
inp
);
netDefault
.
setInput
(
inp
);
Mat
outDefault
=
netDefault
.
forward
(
outputLayer
).
clone
();
Mat
outDefault
=
netDefault
.
forward
(
outputLayer
).
clone
();
Net
net
=
readNet
(
weights
,
proto
);
net
=
readNet
(
weights
,
proto
);
net
.
setInput
(
inp
);
net
.
setInput
(
inp
);
net
.
setPreferableBackend
(
backend
);
net
.
setPreferableBackend
(
backend
);
net
.
setPreferableTarget
(
target
);
net
.
setPreferableTarget
(
target
);
...
@@ -94,6 +94,8 @@ public:
...
@@ -94,6 +94,8 @@ public:
else
else
normAssert
(
ref
,
out
,
msg
,
l1
,
lInf
);
normAssert
(
ref
,
out
,
msg
,
l1
,
lInf
);
}
}
Net
net
;
};
};
TEST_P
(
DNNTestNetwork
,
AlexNet
)
TEST_P
(
DNNTestNetwork
,
AlexNet
)
...
@@ -103,6 +105,7 @@ TEST_P(DNNTestNetwork, AlexNet)
...
@@ -103,6 +105,7 @@ TEST_P(DNNTestNetwork, AlexNet)
Size
(
227
,
227
),
"prob"
,
Size
(
227
,
227
),
"prob"
,
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_alexnet.yml"
:
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_alexnet.yml"
:
"dnn/halide_scheduler_alexnet.yml"
);
"dnn/halide_scheduler_alexnet.yml"
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
ResNet_50
)
TEST_P
(
DNNTestNetwork
,
ResNet_50
)
...
@@ -112,6 +115,7 @@ TEST_P(DNNTestNetwork, ResNet_50)
...
@@ -112,6 +115,7 @@ TEST_P(DNNTestNetwork, ResNet_50)
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"
:
"dnn/halide_scheduler_resnet_50.yml"
);
"dnn/halide_scheduler_resnet_50.yml"
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
SqueezeNet_v1_1
)
TEST_P
(
DNNTestNetwork
,
SqueezeNet_v1_1
)
...
@@ -120,6 +124,7 @@ TEST_P(DNNTestNetwork, SqueezeNet_v1_1)
...
@@ -120,6 +124,7 @@ TEST_P(DNNTestNetwork, SqueezeNet_v1_1)
Size
(
227
,
227
),
"prob"
,
Size
(
227
,
227
),
"prob"
,
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_squeezenet_v1_1.yml"
:
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_squeezenet_v1_1.yml"
:
"dnn/halide_scheduler_squeezenet_v1_1.yml"
);
"dnn/halide_scheduler_squeezenet_v1_1.yml"
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
GoogLeNet
)
TEST_P
(
DNNTestNetwork
,
GoogLeNet
)
...
@@ -127,6 +132,7 @@ TEST_P(DNNTestNetwork, GoogLeNet)
...
@@ -127,6 +132,7 @@ TEST_P(DNNTestNetwork, GoogLeNet)
applyTestTag
(
target
==
DNN_TARGET_CPU
?
""
:
CV_TEST_TAG_MEMORY_512MB
);
applyTestTag
(
target
==
DNN_TARGET_CPU
?
""
:
CV_TEST_TAG_MEMORY_512MB
);
processNet
(
"dnn/bvlc_googlenet.caffemodel"
,
"dnn/bvlc_googlenet.prototxt"
,
processNet
(
"dnn/bvlc_googlenet.caffemodel"
,
"dnn/bvlc_googlenet.prototxt"
,
Size
(
224
,
224
),
"prob"
);
Size
(
224
,
224
),
"prob"
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
Inception_5h
)
TEST_P
(
DNNTestNetwork
,
Inception_5h
)
...
@@ -142,6 +148,7 @@ TEST_P(DNNTestNetwork, Inception_5h)
...
@@ -142,6 +148,7 @@ TEST_P(DNNTestNetwork, Inception_5h)
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_inception_5h.yml"
:
target
==
DNN_TARGET_OPENCL
?
"dnn/halide_scheduler_opencl_inception_5h.yml"
:
"dnn/halide_scheduler_inception_5h.yml"
,
"dnn/halide_scheduler_inception_5h.yml"
,
l1
,
lInf
);
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
ENet
)
TEST_P
(
DNNTestNetwork
,
ENet
)
...
@@ -168,6 +175,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_Caffe)
...
@@ -168,6 +175,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_Caffe)
float
detectionConfThresh
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.252
:
0.0
;
float
detectionConfThresh
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.252
:
0.0
;
processNet
(
"dnn/MobileNetSSD_deploy.caffemodel"
,
"dnn/MobileNetSSD_deploy.prototxt"
,
processNet
(
"dnn/MobileNetSSD_deploy.caffemodel"
,
"dnn/MobileNetSSD_deploy.prototxt"
,
inp
,
"detection_out"
,
""
,
diffScores
,
diffSquares
,
detectionConfThresh
);
inp
,
"detection_out"
,
""
,
diffScores
,
diffSquares
,
detectionConfThresh
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_Caffe_Different_Width_Height
)
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_Caffe_Different_Width_Height
)
...
@@ -185,7 +193,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_Caffe_Different_Width_Height)
...
@@ -185,7 +193,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_Caffe_Different_Width_Height)
float
diffSquares
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.09
:
0.0
;
float
diffSquares
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.09
:
0.0
;
processNet
(
"dnn/MobileNetSSD_deploy.caffemodel"
,
"dnn/MobileNetSSD_deploy.prototxt"
,
processNet
(
"dnn/MobileNetSSD_deploy.caffemodel"
,
"dnn/MobileNetSSD_deploy.prototxt"
,
inp
,
"detection_out"
,
""
,
diffScores
,
diffSquares
);
inp
,
"detection_out"
,
""
,
diffScores
,
diffSquares
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_v1_TensorFlow
)
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_v1_TensorFlow
)
...
@@ -200,6 +208,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_v1_TensorFlow)
...
@@ -200,6 +208,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_v1_TensorFlow)
float
detectionConfThresh
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.216
:
0.2
;
float
detectionConfThresh
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.216
:
0.2
;
processNet
(
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pb"
,
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pbtxt"
,
processNet
(
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pb"
,
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pbtxt"
,
inp
,
"detection_out"
,
""
,
l1
,
lInf
,
detectionConfThresh
);
inp
,
"detection_out"
,
""
,
l1
,
lInf
,
detectionConfThresh
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_v1_TensorFlow_Different_Width_Height
)
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_v1_TensorFlow_Different_Width_Height
)
...
@@ -217,6 +226,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_v1_TensorFlow_Different_Width_Height)
...
@@ -217,6 +226,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_v1_TensorFlow_Different_Width_Height)
float
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.06
:
0.0
;
float
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.06
:
0.0
;
processNet
(
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pb"
,
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pbtxt"
,
processNet
(
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pb"
,
"dnn/ssd_mobilenet_v1_coco_2017_11_17.pbtxt"
,
inp
,
"detection_out"
,
""
,
l1
,
lInf
);
inp
,
"detection_out"
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_v2_TensorFlow
)
TEST_P
(
DNNTestNetwork
,
MobileNet_SSD_v2_TensorFlow
)
...
@@ -230,6 +240,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_v2_TensorFlow)
...
@@ -230,6 +240,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_v2_TensorFlow)
float
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.062
:
0.0
;
float
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.062
:
0.0
;
processNet
(
"dnn/ssd_mobilenet_v2_coco_2018_03_29.pb"
,
"dnn/ssd_mobilenet_v2_coco_2018_03_29.pbtxt"
,
processNet
(
"dnn/ssd_mobilenet_v2_coco_2018_03_29.pb"
,
"dnn/ssd_mobilenet_v2_coco_2018_03_29.pbtxt"
,
inp
,
"detection_out"
,
""
,
l1
,
lInf
,
0.25
);
inp
,
"detection_out"
,
""
,
l1
,
lInf
,
0.25
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
SSD_VGG16
)
TEST_P
(
DNNTestNetwork
,
SSD_VGG16
)
...
@@ -244,6 +255,7 @@ TEST_P(DNNTestNetwork, SSD_VGG16)
...
@@ -244,6 +255,7 @@ TEST_P(DNNTestNetwork, SSD_VGG16)
Mat
inp
=
blobFromImage
(
sample
,
1.0
f
,
Size
(
300
,
300
),
Scalar
(),
false
);
Mat
inp
=
blobFromImage
(
sample
,
1.0
f
,
Size
(
300
,
300
),
Scalar
(),
false
);
processNet
(
"dnn/VGG_ILSVRC2016_SSD_300x300_iter_440000.caffemodel"
,
processNet
(
"dnn/VGG_ILSVRC2016_SSD_300x300_iter_440000.caffemodel"
,
"dnn/ssd_vgg16.prototxt"
,
inp
,
"detection_out"
,
""
,
scoreThreshold
,
lInf
);
"dnn/ssd_vgg16.prototxt"
,
inp
,
"detection_out"
,
""
,
scoreThreshold
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
OpenPose_pose_coco
)
TEST_P
(
DNNTestNetwork
,
OpenPose_pose_coco
)
...
@@ -262,6 +274,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_coco)
...
@@ -262,6 +274,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_coco)
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.072
:
0.0
;
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.072
:
0.0
;
processNet
(
"dnn/openpose_pose_coco.caffemodel"
,
"dnn/openpose_pose_coco.prototxt"
,
processNet
(
"dnn/openpose_pose_coco.caffemodel"
,
"dnn/openpose_pose_coco.prototxt"
,
Size
(
46
,
46
),
""
,
""
,
l1
,
lInf
);
Size
(
46
,
46
),
""
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
OpenPose_pose_mpi
)
TEST_P
(
DNNTestNetwork
,
OpenPose_pose_mpi
)
...
@@ -280,6 +293,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi)
...
@@ -280,6 +293,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi)
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
||
target
==
DNN_TARGET_OPENCL_FP16
)
?
0.16
:
0.0
;
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
||
target
==
DNN_TARGET_OPENCL_FP16
)
?
0.16
:
0.0
;
processNet
(
"dnn/openpose_pose_mpi.caffemodel"
,
"dnn/openpose_pose_mpi.prototxt"
,
processNet
(
"dnn/openpose_pose_mpi.caffemodel"
,
"dnn/openpose_pose_mpi.prototxt"
,
Size
(
46
,
46
),
""
,
""
,
l1
,
lInf
);
Size
(
46
,
46
),
""
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
OpenPose_pose_mpi_faster_4_stages
)
TEST_P
(
DNNTestNetwork
,
OpenPose_pose_mpi_faster_4_stages
)
...
@@ -296,6 +310,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi_faster_4_stages)
...
@@ -296,6 +310,7 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi_faster_4_stages)
// See https://github.com/CMU-Perceptual-Computing-Lab/openpose/blob/master/src/openpose/pose/poseParameters.cpp
// See https://github.com/CMU-Perceptual-Computing-Lab/openpose/blob/master/src/openpose/pose/poseParameters.cpp
processNet
(
"dnn/openpose_pose_mpi.caffemodel"
,
"dnn/openpose_pose_mpi_faster_4_stages.prototxt"
,
processNet
(
"dnn/openpose_pose_mpi.caffemodel"
,
"dnn/openpose_pose_mpi_faster_4_stages.prototxt"
,
Size
(
46
,
46
));
Size
(
46
,
46
));
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
OpenFace
)
TEST_P
(
DNNTestNetwork
,
OpenFace
)
...
@@ -324,6 +339,7 @@ TEST_P(DNNTestNetwork, opencv_face_detector)
...
@@ -324,6 +339,7 @@ TEST_P(DNNTestNetwork, opencv_face_detector)
Mat
inp
=
blobFromImage
(
img
,
1.0
,
Size
(),
Scalar
(
104.0
,
177.0
,
123.0
),
false
,
false
);
Mat
inp
=
blobFromImage
(
img
,
1.0
,
Size
(),
Scalar
(
104.0
,
177.0
,
123.0
),
false
,
false
);
processNet
(
"dnn/opencv_face_detector.caffemodel"
,
"dnn/opencv_face_detector.prototxt"
,
processNet
(
"dnn/opencv_face_detector.caffemodel"
,
"dnn/opencv_face_detector.prototxt"
,
inp
,
"detection_out"
);
inp
,
"detection_out"
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
Inception_v2_SSD_TensorFlow
)
TEST_P
(
DNNTestNetwork
,
Inception_v2_SSD_TensorFlow
)
...
@@ -342,6 +358,7 @@ TEST_P(DNNTestNetwork, Inception_v2_SSD_TensorFlow)
...
@@ -342,6 +358,7 @@ TEST_P(DNNTestNetwork, Inception_v2_SSD_TensorFlow)
float
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.0731
:
0.0
;
float
lInf
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.0731
:
0.0
;
processNet
(
"dnn/ssd_inception_v2_coco_2017_11_17.pb"
,
"dnn/ssd_inception_v2_coco_2017_11_17.pbtxt"
,
processNet
(
"dnn/ssd_inception_v2_coco_2017_11_17.pb"
,
"dnn/ssd_inception_v2_coco_2017_11_17.pbtxt"
,
inp
,
"detection_out"
,
""
,
l1
,
lInf
);
inp
,
"detection_out"
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
DenseNet_121
)
TEST_P
(
DNNTestNetwork
,
DenseNet_121
)
...
@@ -360,6 +377,7 @@ TEST_P(DNNTestNetwork, DenseNet_121)
...
@@ -360,6 +377,7 @@ TEST_P(DNNTestNetwork, DenseNet_121)
l1
=
0.1
;
lInf
=
0.6
;
l1
=
0.1
;
lInf
=
0.6
;
}
}
processNet
(
"dnn/DenseNet_121.caffemodel"
,
"dnn/DenseNet_121.prototxt"
,
Size
(
224
,
224
),
""
,
""
,
l1
,
lInf
);
processNet
(
"dnn/DenseNet_121.caffemodel"
,
"dnn/DenseNet_121.prototxt"
,
Size
(
224
,
224
),
""
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
DNNTestNetwork
,
FastNeuralStyle_eccv16
)
TEST_P
(
DNNTestNetwork
,
FastNeuralStyle_eccv16
)
...
...
modules/dnn/test/test_caffe_importer.cpp
View file @
163d5e4d
...
@@ -417,6 +417,7 @@ TEST_P(Test_Caffe_nets, Colorization)
...
@@ -417,6 +417,7 @@ TEST_P(Test_Caffe_nets, Colorization)
l1
=
0.6
;
lInf
=
15
;
l1
=
0.6
;
lInf
=
15
;
}
}
normAssert
(
out
,
ref
,
""
,
l1
,
lInf
);
normAssert
(
out
,
ref
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_Caffe_nets
,
DenseNet_121
)
TEST_P
(
Test_Caffe_nets
,
DenseNet_121
)
...
@@ -448,6 +449,7 @@ TEST_P(Test_Caffe_nets, DenseNet_121)
...
@@ -448,6 +449,7 @@ TEST_P(Test_Caffe_nets, DenseNet_121)
l1
=
0.11
;
lInf
=
0.5
;
l1
=
0.11
;
lInf
=
0.5
;
}
}
normAssert
(
out
,
ref
,
""
,
l1
,
lInf
);
normAssert
(
out
,
ref
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST
(
Test_Caffe
,
multiple_inputs
)
TEST
(
Test_Caffe
,
multiple_inputs
)
...
...
modules/dnn/test/test_common.hpp
View file @
163d5e4d
...
@@ -110,6 +110,31 @@ public:
...
@@ -110,6 +110,31 @@ public:
}
}
}
}
void
expectNoFallbacks
(
Net
&
net
)
{
// Check if all the layers are supported with current backend and target.
// Some layers might be fused so their timings equal to zero.
std
::
vector
<
double
>
timings
;
net
.
getPerfProfile
(
timings
);
std
::
vector
<
String
>
names
=
net
.
getLayerNames
();
CV_Assert
(
names
.
size
()
==
timings
.
size
());
for
(
int
i
=
0
;
i
<
names
.
size
();
++
i
)
{
Ptr
<
dnn
::
Layer
>
l
=
net
.
getLayer
(
net
.
getLayerId
(
names
[
i
]));
bool
fused
=
!
timings
[
i
];
if
((
!
l
->
supportBackend
(
backend
)
||
l
->
preferableTarget
!=
target
)
&&
!
fused
)
CV_Error
(
Error
::
StsNotImplemented
,
"Layer ["
+
l
->
name
+
"] of type ["
+
l
->
type
+
"] is expected to has backend implementation"
);
}
}
void
expectNoFallbacksFromIE
(
Net
&
net
)
{
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
)
expectNoFallbacks
(
net
);
}
protected
:
protected
:
void
checkBackend
(
Mat
*
inp
=
0
,
Mat
*
ref
=
0
)
void
checkBackend
(
Mat
*
inp
=
0
,
Mat
*
ref
=
0
)
{
{
...
...
modules/dnn/test/test_onnx_importer.cpp
View file @
163d5e4d
...
@@ -28,7 +28,8 @@ public:
...
@@ -28,7 +28,8 @@ public:
};
};
void
testONNXModels
(
const
String
&
basename
,
const
Extension
ext
=
npy
,
void
testONNXModels
(
const
String
&
basename
,
const
Extension
ext
=
npy
,
const
double
l1
=
0
,
const
float
lInf
=
0
,
const
bool
useSoftmax
=
false
)
const
double
l1
=
0
,
const
float
lInf
=
0
,
const
bool
useSoftmax
=
false
,
bool
checkNoFallbacks
=
true
)
{
{
String
onnxmodel
=
_tf
(
"models/"
+
basename
+
".onnx"
);
String
onnxmodel
=
_tf
(
"models/"
+
basename
+
".onnx"
);
Mat
inp
,
ref
;
Mat
inp
,
ref
;
...
@@ -67,6 +68,8 @@ public:
...
@@ -67,6 +68,8 @@ public:
ref
=
netSoftmax
.
forward
();
ref
=
netSoftmax
.
forward
();
}
}
normAssert
(
ref
,
out
,
""
,
l1
?
l1
:
default_l1
,
lInf
?
lInf
:
default_lInf
);
normAssert
(
ref
,
out
,
""
,
l1
?
l1
:
default_l1
,
lInf
?
lInf
:
default_lInf
);
if
(
checkNoFallbacks
)
expectNoFallbacksFromIE
(
net
);
}
}
};
};
...
@@ -103,11 +106,11 @@ TEST_P(Test_ONNX_layers, Two_convolution)
...
@@ -103,11 +106,11 @@ TEST_P(Test_ONNX_layers, Two_convolution)
TEST_P
(
Test_ONNX_layers
,
Deconvolution
)
TEST_P
(
Test_ONNX_layers
,
Deconvolution
)
{
{
testONNXModels
(
"deconvolution"
);
testONNXModels
(
"deconvolution"
,
npy
,
0
,
0
,
false
,
false
);
testONNXModels
(
"two_deconvolution"
);
testONNXModels
(
"two_deconvolution"
,
npy
,
0
,
0
,
false
,
false
);
testONNXModels
(
"deconvolution_group"
);
testONNXModels
(
"deconvolution_group"
,
npy
,
0
,
0
,
false
,
false
);
testONNXModels
(
"deconvolution_output_shape"
);
testONNXModels
(
"deconvolution_output_shape"
,
npy
,
0
,
0
,
false
,
false
);
testONNXModels
(
"deconv_adjpad_2d"
);
testONNXModels
(
"deconv_adjpad_2d"
,
npy
,
0
,
0
,
false
,
false
);
}
}
TEST_P
(
Test_ONNX_layers
,
Dropout
)
TEST_P
(
Test_ONNX_layers
,
Dropout
)
...
@@ -220,6 +223,7 @@ TEST_P(Test_ONNX_layers, MultyInputs)
...
@@ -220,6 +223,7 @@ TEST_P(Test_ONNX_layers, MultyInputs)
Mat
out
=
net
.
forward
();
Mat
out
=
net
.
forward
();
normAssert
(
ref
,
out
,
""
,
default_l1
,
default_lInf
);
normAssert
(
ref
,
out
,
""
,
default_l1
,
default_lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_ONNX_layers
,
DynamicReshape
)
TEST_P
(
Test_ONNX_layers
,
DynamicReshape
)
...
@@ -257,6 +261,7 @@ TEST_P(Test_ONNX_nets, Alexnet)
...
@@ -257,6 +261,7 @@ TEST_P(Test_ONNX_nets, Alexnet)
Mat
out
=
net
.
forward
();
Mat
out
=
net
.
forward
();
normAssert
(
out
,
ref
,
""
,
default_l1
,
default_lInf
);
normAssert
(
out
,
ref
,
""
,
default_l1
,
default_lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_ONNX_nets
,
Squeezenet
)
TEST_P
(
Test_ONNX_nets
,
Squeezenet
)
...
@@ -289,6 +294,7 @@ TEST_P(Test_ONNX_nets, Googlenet)
...
@@ -289,6 +294,7 @@ TEST_P(Test_ONNX_nets, Googlenet)
Mat
out
=
net
.
forward
();
Mat
out
=
net
.
forward
();
normAssert
(
ref
,
out
,
""
,
default_l1
,
default_lInf
);
normAssert
(
ref
,
out
,
""
,
default_l1
,
default_lInf
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_ONNX_nets
,
CaffeNet
)
TEST_P
(
Test_ONNX_nets
,
CaffeNet
)
...
...
modules/dnn/test/test_tf_importer.cpp
View file @
163d5e4d
...
@@ -356,6 +356,7 @@ TEST_P(Test_TensorFlow_nets, MobileNet_SSD)
...
@@ -356,6 +356,7 @@ TEST_P(Test_TensorFlow_nets, MobileNet_SSD)
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.0043
:
default_l1
;
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.0043
:
default_l1
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.037
:
default_lInf
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.037
:
default_lInf
;
normAssertDetections
(
ref
,
out
,
""
,
0.2
,
scoreDiff
,
iouDiff
);
normAssertDetections
(
ref
,
out
,
""
,
0.2
,
scoreDiff
,
iouDiff
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_TensorFlow_nets
,
Inception_v2_SSD
)
TEST_P
(
Test_TensorFlow_nets
,
Inception_v2_SSD
)
...
@@ -393,6 +394,7 @@ TEST_P(Test_TensorFlow_nets, Inception_v2_SSD)
...
@@ -393,6 +394,7 @@ TEST_P(Test_TensorFlow_nets, Inception_v2_SSD)
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.0097
:
default_l1
;
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.0097
:
default_l1
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.09
:
default_lInf
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.09
:
default_lInf
;
normAssertDetections
(
ref
,
out
,
""
,
0.5
,
scoreDiff
,
iouDiff
);
normAssertDetections
(
ref
,
out
,
""
,
0.5
,
scoreDiff
,
iouDiff
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_TensorFlow_nets
,
MobileNet_v1_SSD
)
TEST_P
(
Test_TensorFlow_nets
,
MobileNet_v1_SSD
)
...
@@ -423,6 +425,7 @@ TEST_P(Test_TensorFlow_nets, MobileNet_v1_SSD)
...
@@ -423,6 +425,7 @@ TEST_P(Test_TensorFlow_nets, MobileNet_v1_SSD)
float
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
7e-3
:
1.5e-5
;
float
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
7e-3
:
1.5e-5
;
float
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.012
:
1e-3
;
float
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.012
:
1e-3
;
normAssertDetections
(
ref
,
out
,
""
,
0.3
,
scoreDiff
,
iouDiff
);
normAssertDetections
(
ref
,
out
,
""
,
0.3
,
scoreDiff
,
iouDiff
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_TensorFlow_nets
,
Faster_RCNN
)
TEST_P
(
Test_TensorFlow_nets
,
Faster_RCNN
)
...
@@ -481,6 +484,7 @@ TEST_P(Test_TensorFlow_nets, MobileNet_v1_SSD_PPN)
...
@@ -481,6 +484,7 @@ TEST_P(Test_TensorFlow_nets, MobileNet_v1_SSD_PPN)
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.048
:
1.1e-5
;
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.048
:
1.1e-5
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.058
:
default_lInf
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.058
:
default_lInf
;
normAssertDetections
(
ref
,
out
,
""
,
0.45
,
scoreDiff
,
iouDiff
);
normAssertDetections
(
ref
,
out
,
""
,
0.45
,
scoreDiff
,
iouDiff
);
expectNoFallbacksFromIE
(
net
);
}
}
TEST_P
(
Test_TensorFlow_nets
,
opencv_face_detector_uint8
)
TEST_P
(
Test_TensorFlow_nets
,
opencv_face_detector_uint8
)
...
@@ -510,6 +514,7 @@ TEST_P(Test_TensorFlow_nets, opencv_face_detector_uint8)
...
@@ -510,6 +514,7 @@ TEST_P(Test_TensorFlow_nets, opencv_face_detector_uint8)
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
4e-3
:
3.4e-3
;
double
scoreDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
4e-3
:
3.4e-3
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.024
:
1e-2
;
double
iouDiff
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
0.024
:
1e-2
;
normAssertDetections
(
ref
,
out
,
""
,
0.9
,
scoreDiff
,
iouDiff
);
normAssertDetections
(
ref
,
out
,
""
,
0.9
,
scoreDiff
,
iouDiff
);
expectNoFallbacksFromIE
(
net
);
}
}
// inp = cv.imread('opencv_extra/testdata/cv/ximgproc/sources/08.png')
// inp = cv.imread('opencv_extra/testdata/cv/ximgproc/sources/08.png')
...
@@ -574,6 +579,7 @@ TEST_P(Test_TensorFlow_nets, EAST_text_detection)
...
@@ -574,6 +579,7 @@ TEST_P(Test_TensorFlow_nets, EAST_text_detection)
}
}
normAssert
(
scores
,
blobFromNPY
(
refScoresPath
),
"scores"
,
l1_scores
,
lInf_scores
);
normAssert
(
scores
,
blobFromNPY
(
refScoresPath
),
"scores"
,
l1_scores
,
lInf_scores
);
normAssert
(
geometry
,
blobFromNPY
(
refGeometryPath
),
"geometry"
,
l1_geometry
,
lInf_geometry
);
normAssert
(
geometry
,
blobFromNPY
(
refGeometryPath
),
"geometry"
,
l1_geometry
,
lInf_geometry
);
expectNoFallbacksFromIE
(
net
);
}
}
INSTANTIATE_TEST_CASE_P
(
/**/
,
Test_TensorFlow_nets
,
dnnBackendsAndTargets
());
INSTANTIATE_TEST_CASE_P
(
/**/
,
Test_TensorFlow_nets
,
dnnBackendsAndTargets
());
...
...
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