Merge pull request #24878 from TolyaTalamanov:at/g-api-ifdef-openvino-api10-backend

G-API: Ifdef OpenVINO API 1.0 functionality
pull/24895/head
Alexander Smorkalov 1 year ago committed by GitHub
commit e56e500cd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      modules/gapi/src/backends/ie/giebackend.cpp
  2. 4
      modules/gapi/src/backends/ie/giebackend.hpp
  3. 4
      modules/gapi/src/backends/ie/giebackend/giewrapper.cpp
  4. 2
      modules/gapi/test/infer/gapi_infer_ie_test.cpp

@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2018-2023 Intel Corporation
// Copyright (C) 2018-2024 Intel Corporation
#include "precomp.hpp"
@ -10,7 +10,7 @@
// (cv::gapi::ie::backend() is still there and is defined always)
#include "backends/ie/giebackend.hpp"
#ifdef HAVE_INF_ENGINE
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#if INF_ENGINE_RELEASE <= 2019010000
# error G-API IE module supports only OpenVINO IE >= 2019 R1

@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2018-2020 Intel Corporation
// Copyright (C) 2018-2024 Intel Corporation
#ifndef OPENCV_GAPI_GIEBACKEND_HPP
#define OPENCV_GAPI_GIEBACKEND_HPP
@ -10,7 +10,7 @@
// Include anyway - cv::gapi::ie::backend() still needs to be defined
#include "opencv2/gapi/infer/ie.hpp"
#ifdef HAVE_INF_ENGINE
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#include <ade/util/algorithm.hpp> // type_list_index
#include <condition_variable>

@ -2,9 +2,9 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2020 Intel Corporation
// Copyright (C) 2020-2024 Intel Corporation
#ifdef HAVE_INF_ENGINE
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#include <vector>
#include <string>

@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#ifdef HAVE_INF_ENGINE
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#include <stdexcept>
#include <mutex>

Loading…
Cancel
Save