Skip to content

Commit c2664d9

Browse files
committed
Merge pull request opencv#17538 from alalek:dnn_openvino_2020.3.0
2 parents d753ae1 + d2a9efd commit c2664d9

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

cmake/OpenCVDetectInferenceEngine.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ endif()
135135

136136
if(INF_ENGINE_TARGET)
137137
if(NOT INF_ENGINE_RELEASE)
138-
message(WARNING "InferenceEngine version has not been set, 2020.2 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
138+
message(WARNING "InferenceEngine version has not been set, 2020.3 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
139139
endif()
140-
set(INF_ENGINE_RELEASE "2020020000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)")
140+
set(INF_ENGINE_RELEASE "2020030000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)")
141141
set_target_properties(${INF_ENGINE_TARGET} PROPERTIES
142142
INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}"
143143
)

modules/dnn/src/dnn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,7 @@ struct Net::Impl : public detail::NetImplBase
21132113

21142114
auto ieInpNode = inputNodes[i].dynamicCast<InfEngineNgraphNode>();
21152115
CV_Assert(oid < ieInpNode->node->get_output_size());
2116-
#if INF_ENGINE_VER_MAJOR_GT(2020030000)
2116+
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_3)
21172117
inputNodes[i] = Ptr<BackendNode>(new InfEngineNgraphNode(ieInpNode->node->get_output_as_single_output_node(oid)));
21182118
#else
21192119
inputNodes[i] = Ptr<BackendNode>(new InfEngineNgraphNode(ieInpNode->node->get_output_as_single_output_node(oid, false)));

modules/dnn/src/ie_ngraph.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class NgraphCustomOp: public ngraph::op::Op {
8282
return type_info;
8383
}
8484

85-
#if INF_ENGINE_VER_MAJOR_GT(2020020000)
85+
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_3)
8686
NgraphCustomOp(const ngraph::OutputVector& inputs,
8787
#else
8888
NgraphCustomOp(const ngraph::NodeVector& inputs,
@@ -112,7 +112,7 @@ class NgraphCustomOp: public ngraph::op::Op {
112112

113113
std::shared_ptr<ngraph::Node> copy_with_new_args(const ngraph::NodeVector& new_args) const override
114114
{
115-
#if INF_ENGINE_VER_MAJOR_GT(2020020000)
115+
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_3)
116116
return std::make_shared<NgraphCustomOp>(ngraph::as_output_vector(new_args), params);
117117
#else
118118
return std::make_shared<NgraphCustomOp>(new_args, params);
@@ -283,7 +283,7 @@ InfEngineNgraphNode::InfEngineNgraphNode(const std::vector<Ptr<BackendNode> >& n
283283
{"internals", shapesToStr(internals)}
284284
};
285285

286-
#if INF_ENGINE_VER_MAJOR_GT(2020020000)
286+
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_3)
287287
ngraph::OutputVector inp_nodes;
288288
#else
289289
ngraph::NodeVector inp_nodes;

modules/dnn/src/op_inf_engine.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
#define INF_ENGINE_RELEASE_2019R3 2019030000
2626
#define INF_ENGINE_RELEASE_2020_1 2020010000
2727
#define INF_ENGINE_RELEASE_2020_2 2020020000
28+
#define INF_ENGINE_RELEASE_2020_3 2020030000
2829

2930
#ifndef INF_ENGINE_RELEASE
30-
#warning("IE version have not been provided via command-line. Using 2020.2 by default")
31-
#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2020_2
31+
#warning("IE version have not been provided via command-line. Using 2020.3 by default")
32+
#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2020_3
3233
#endif
3334

3435
#define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000))

0 commit comments

Comments
 (0)