From d81a0da3e0e8152965e9bbf08dee4bee5f1a8197 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 14 Jan 2020 16:20:12 +0300 Subject: [PATCH 1/2] dnn: use OpenVINO 2020.1 defines --- cmake/OpenCVDetectInferenceEngine.cmake | 4 ++-- modules/dnn/src/op_inf_engine.hpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index 5326eb9795..8121f471fa 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -99,9 +99,9 @@ endif() if(INF_ENGINE_TARGET) if(NOT INF_ENGINE_RELEASE) - message(WARNING "InferenceEngine version have not been set, 2019R3 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") + message(WARNING "InferenceEngine version has not been set, 2020.1 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") endif() - set(INF_ENGINE_RELEASE "2019030000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)") + set(INF_ENGINE_RELEASE "2020010000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)") set_target_properties(${INF_ENGINE_TARGET} PROPERTIES INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}" ) diff --git a/modules/dnn/src/op_inf_engine.hpp b/modules/dnn/src/op_inf_engine.hpp index 217eb9a008..408fe0c4b7 100644 --- a/modules/dnn/src/op_inf_engine.hpp +++ b/modules/dnn/src/op_inf_engine.hpp @@ -23,10 +23,11 @@ #define INF_ENGINE_RELEASE_2019R1 2019010000 #define INF_ENGINE_RELEASE_2019R2 2019020000 #define INF_ENGINE_RELEASE_2019R3 2019030000 +#define INF_ENGINE_RELEASE_2020_1 2020010000 #ifndef INF_ENGINE_RELEASE -#warning("IE version have not been provided via command-line. Using 2019R3 by default") -#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2019R3 +#warning("IE version have not been provided via command-line. Using 2019.1 by default") +#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2020_1 #endif #define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000)) From 0a91261c7f21db40c8ef8a180d9e7c77a5dd81c9 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 12 Feb 2020 17:22:44 +0300 Subject: [PATCH 2/2] dnn: turn off visibility workaround for OpenVINO 2020.1 --- modules/dnn/src/op_inf_engine.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dnn/src/op_inf_engine.hpp b/modules/dnn/src/op_inf_engine.hpp index 408fe0c4b7..7cf8a324aa 100644 --- a/modules/dnn/src/op_inf_engine.hpp +++ b/modules/dnn/src/op_inf_engine.hpp @@ -50,7 +50,7 @@ #pragma warning(disable: 4996) // was declared deprecated #endif -#if defined(__GNUC__) +#if defined(__GNUC__) && INF_ENGINE_VER_MAJOR_LT(INF_ENGINE_RELEASE_2020_1) #pragma GCC visibility push(default) #endif @@ -58,7 +58,7 @@ #include -#if defined(__GNUC__) +#if defined(__GNUC__) && INF_ENGINE_VER_MAJOR_LT(INF_ENGINE_RELEASE_2020_1) #pragma GCC visibility pop #endif