From e8c20bfae60c45e8be6617fe66972fa66b7d74fb Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 27 Mar 2019 18:29:24 +0000 Subject: [PATCH] dnn: fix support drop for IE<2018R3 - fix build with IE 2018R3 --- modules/dnn/src/op_inf_engine.cpp | 4 ++++ modules/dnn/src/op_inf_engine.hpp | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/dnn/src/op_inf_engine.cpp b/modules/dnn/src/op_inf_engine.cpp index 786b4e31d5..470c997804 100644 --- a/modules/dnn/src/op_inf_engine.cpp +++ b/modules/dnn/src/op_inf_engine.cpp @@ -784,7 +784,11 @@ bool InfEngineBackendLayer::getMemoryShapes(const std::vector &inputs, std::vector &outputs, std::vector &internals) const { +#if INF_ENGINE_VER_MAJOR_EQ(INF_ENGINE_RELEASE_2018R3) + InferenceEngine::ICNNNetwork::InputShapes inShapes = const_cast(t_net).getInputShapes(); +#else InferenceEngine::ICNNNetwork::InputShapes inShapes = t_net.getInputShapes(); +#endif InferenceEngine::ICNNNetwork::InputShapes::iterator itr; bool equal_flag = true; size_t i = 0; diff --git a/modules/dnn/src/op_inf_engine.hpp b/modules/dnn/src/op_inf_engine.hpp index 7ad49c1976..689b6171de 100644 --- a/modules/dnn/src/op_inf_engine.hpp +++ b/modules/dnn/src/op_inf_engine.hpp @@ -114,10 +114,8 @@ public: virtual size_t getBatchSize() const noexcept CV_OVERRIDE; -#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2018R2) - virtual InferenceEngine::StatusCode AddExtension(const InferenceEngine::IShapeInferExtensionPtr& extension, InferenceEngine::ResponseDesc* resp) noexcept; - virtual InferenceEngine::StatusCode reshape(const InputShapes& inputShapes, InferenceEngine::ResponseDesc* resp) noexcept; -#endif + virtual InferenceEngine::StatusCode AddExtension(const InferenceEngine::IShapeInferExtensionPtr& extension, InferenceEngine::ResponseDesc* resp) noexcept CV_OVERRIDE; + virtual InferenceEngine::StatusCode reshape(const InputShapes& inputShapes, InferenceEngine::ResponseDesc* resp) noexcept CV_OVERRIDE; void init(int targetId);