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
b8d4664e
Commit
b8d4664e
authored
Sep 09, 2019
by
Dmitry Kurtaev
Committed by
Maksim Shabunin
Sep 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix OpenVINO 2019R1 compilation
parent
bd5d16ce
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
dnn.cpp
modules/dnn/src/dnn.cpp
+2
-1
op_inf_engine.cpp
modules/dnn/src/op_inf_engine.cpp
+2
-1
test_darknet_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
+2
-0
test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+4
-1
No files found.
modules/dnn/src/dnn.cpp
View file @
b8d4664e
...
...
@@ -1619,7 +1619,8 @@ struct Net::Impl
Ptr
<
Layer
>
layer
=
ld
.
layerInstance
;
if
(
!
fused
&&
!
layer
->
supportBackend
(
preferableBackend
))
{
bool
customizable
=
ld
.
id
!=
0
&&
ld
.
outputBlobs
.
size
()
==
1
;
bool
customizable
=
ld
.
id
!=
0
&&
ld
.
outputBlobs
.
size
()
==
1
&&
INF_ENGINE_VER_MAJOR_GE
(
INF_ENGINE_RELEASE_2019R2
);
// TODO: there is a bug in Myriad plugin with custom layers shape infer.
if
(
preferableTarget
==
DNN_TARGET_MYRIAD
)
{
...
...
modules/dnn/src/op_inf_engine.cpp
View file @
b8d4664e
...
...
@@ -582,7 +582,6 @@ void InfEngineBackendNet::initPlugin(InferenceEngine::CNNNetwork& net)
try
{
AutoLock
lock
(
getInitializationMutex
());
InferenceEngine
::
Core
&
ie
=
getCore
();
#if INF_ENGINE_VER_MAJOR_LE(INF_ENGINE_RELEASE_2019R1)
auto
&
sharedPlugins
=
getSharedPlugins
();
auto
pluginIt
=
sharedPlugins
.
find
(
device_name
);
...
...
@@ -591,6 +590,8 @@ void InfEngineBackendNet::initPlugin(InferenceEngine::CNNNetwork& net)
enginePtr
=
pluginIt
->
second
;
}
else
#else
InferenceEngine
::
Core
&
ie
=
getCore
();
#endif
{
#if INF_ENGINE_VER_MAJOR_LE(INF_ENGINE_RELEASE_2019R1)
...
...
modules/dnn/test/test_darknet_importer.cpp
View file @
b8d4664e
...
...
@@ -334,6 +334,8 @@ static const std::chrono::milliseconds async_timeout(500);
typedef
testing
::
TestWithParam
<
tuple
<
std
::
string
,
Target
>
>
Test_Darknet_nets_async
;
TEST_P
(
Test_Darknet_nets_async
,
Accuracy
)
{
if
(
INF_ENGINE_VER_MAJOR_LT
(
2019020000
))
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE
);
applyTestTag
(
CV_TEST_TAG_MEMORY_512MB
);
std
::
string
prefix
=
get
<
0
>
(
GetParam
());
...
...
modules/dnn/test/test_tf_importer.cpp
View file @
b8d4664e
...
...
@@ -481,8 +481,11 @@ TEST_P(Test_TensorFlow_nets, Faster_RCNN)
"faster_rcnn_resnet50_coco_2018_01_28"
};
checkBackend
();
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
!=
DNN_TARGET_CPU
)
#ifdef INF_ENGINE_RELEASE
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
INF_ENGINE_VER_MAJOR_LT
(
2019020000
)
||
target
!=
DNN_TARGET_CPU
))
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE
);
#endif
if
(
backend
==
DNN_BACKEND_OPENCV
&&
target
==
DNN_TARGET_OPENCL_FP16
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_OPENCL_FP16
);
...
...
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