From 5fbf3d85bfacc881e99131727bf8b1b2cc6175be Mon Sep 17 00:00:00 2001 From: Anatoliy Talamanov Date: Wed, 21 Feb 2024 08:45:36 +0000 Subject: [PATCH] Merge pull request #25054 from TolyaTalamanov:at/gapi-lower-supported-ie-backend-version G-API: Lower supported IE backend version #25054 Related to https://github.com/opencv/opencv/issues/25053 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake --- modules/gapi/src/backends/ie/giebackend.cpp | 2 +- modules/gapi/src/backends/ie/giebackend.hpp | 2 +- modules/gapi/src/backends/ie/giebackend/giewrapper.cpp | 2 +- modules/gapi/test/infer/gapi_infer_ie_test.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gapi/src/backends/ie/giebackend.cpp b/modules/gapi/src/backends/ie/giebackend.cpp index cdb246e4a2..000021d898 100644 --- a/modules/gapi/src/backends/ie/giebackend.cpp +++ b/modules/gapi/src/backends/ie/giebackend.cpp @@ -10,7 +10,7 @@ // (cv::gapi::ie::backend() is still there and is defined always) #include "backends/ie/giebackend.hpp" -#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000 +#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000 #if INF_ENGINE_RELEASE <= 2019010000 # error G-API IE module supports only OpenVINO IE >= 2019 R1 diff --git a/modules/gapi/src/backends/ie/giebackend.hpp b/modules/gapi/src/backends/ie/giebackend.hpp index 98715fc2db..1f000600dc 100644 --- a/modules/gapi/src/backends/ie/giebackend.hpp +++ b/modules/gapi/src/backends/ie/giebackend.hpp @@ -10,7 +10,7 @@ // Include anyway - cv::gapi::ie::backend() still needs to be defined #include "opencv2/gapi/infer/ie.hpp" -#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000 +#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000 #include // type_list_index #include diff --git a/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp b/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp index 6df8187e16..e3537edf8f 100644 --- a/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp +++ b/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp @@ -4,7 +4,7 @@ // // Copyright (C) 2020-2024 Intel Corporation -#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000 +#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000 #include #include diff --git a/modules/gapi/test/infer/gapi_infer_ie_test.cpp b/modules/gapi/test/infer/gapi_infer_ie_test.cpp index 8e91d576aa..f6a6be0651 100644 --- a/modules/gapi/test/infer/gapi_infer_ie_test.cpp +++ b/modules/gapi/test/infer/gapi_infer_ie_test.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000 +#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000 #include #include