From 603eadfe516c7ff5e5908b2f6133089c1001397e Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 26 Jul 2018 13:17:09 +0300 Subject: [PATCH 1/3] OpenCV version '-openvino' --- modules/core/include/opencv2/core/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 873e3a2d73..c8ca640302 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -8,7 +8,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 #define CV_VERSION_REVISION 3 -#define CV_VERSION_STATUS "" +#define CV_VERSION_STATUS "-openvino.2018R3" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From 8b197c58e6ccb9c04803ae08a3155c902e57d712 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 7 Aug 2018 15:01:36 +0300 Subject: [PATCH 2/3] openvino: use 2018R3 defines --- cmake/OpenCVDetectInferenceEngine.cmake | 4 ++-- modules/dnn/src/op_inf_engine.hpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index e5e64fc6db..e36eb0852b 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -78,9 +78,9 @@ endif() if(INF_ENGINE_TARGET) if(NOT INF_ENGINE_RELEASE) - message(WARNING "InferenceEngine version have not been set, 2018R2 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") + message(WARNING "InferenceEngine version have not been set, 2018R3 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") endif() - set(INF_ENGINE_RELEASE "2018020000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)") + set(INF_ENGINE_RELEASE "2018030000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)") 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 a811f4eae7..3dd0c79229 100644 --- a/modules/dnn/src/op_inf_engine.hpp +++ b/modules/dnn/src/op_inf_engine.hpp @@ -24,6 +24,7 @@ #define INF_ENGINE_RELEASE_2018R1 2018010000 #define INF_ENGINE_RELEASE_2018R2 2018020000 +#define INF_ENGINE_RELEASE_2018R3 2018030000 #ifndef INF_ENGINE_RELEASE #warning("IE version have not been provided via command-line. Using 2018R2 by default") From eff0f9d3f8ef2474fd8401d6727441388b63ad51 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 14 Aug 2018 15:39:32 +0300 Subject: [PATCH 3/3] Fixed windows build with InferenceEngine --- modules/dnn/src/layers/normalize_bbox_layer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dnn/src/layers/normalize_bbox_layer.cpp b/modules/dnn/src/layers/normalize_bbox_layer.cpp index 70d9b7385a..fbb29292c2 100644 --- a/modules/dnn/src/layers/normalize_bbox_layer.cpp +++ b/modules/dnn/src/layers/normalize_bbox_layer.cpp @@ -276,7 +276,7 @@ public: { auto weights = InferenceEngine::make_shared_blob(InferenceEngine::Precision::FP32, InferenceEngine::Layout::C, - {numChannels}); + {(size_t)numChannels}); weights->allocate(); std::vector ones(numChannels, 1); weights->set(ones); @@ -286,7 +286,7 @@ public: else { CV_Assert(numChannels == blobs[0].total()); - ieLayer->blobs["weights"] = wrapToInfEngineBlob(blobs[0], {numChannels}, InferenceEngine::Layout::C); + ieLayer->blobs["weights"] = wrapToInfEngineBlob(blobs[0], {(size_t)numChannels}, InferenceEngine::Layout::C); ieLayer->params["channel_shared"] = blobs[0].total() == 1 ? "1" : "0"; } ieLayer->params["eps"] = format("%f", epsilon);