Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
G-API: Ifdef OpenVINO API 1.0 functionality
pull/24895/head
Alexander Smorkalov 1 year ago committed by GitHub
parent 72f07170f3 8ba69562b5
commit e56e500cd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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

4
modules/gapi/src/backends/ie/giebackend.cpp
Unescape View File

@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory // 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. // 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" #include "precomp.hpp"
@ -10,7 +10,7 @@
// (cv::gapi::ie::backend() is still there and is defined always) // (cv::gapi::ie::backend() is still there and is defined always)
#include "backends/ie/giebackend.hpp" #include "backends/ie/giebackend.hpp"
#ifdef HAVE_INF_ENGINE #if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#if INF_ENGINE_RELEASE <= 2019010000 #if INF_ENGINE_RELEASE <= 2019010000
# error G-API IE module supports only OpenVINO IE >= 2019 R1 # error G-API IE module supports only OpenVINO IE >= 2019 R1

4
modules/gapi/src/backends/ie/giebackend.hpp
Unescape View File

@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory // 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. // 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 #ifndef OPENCV_GAPI_GIEBACKEND_HPP
#define 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 anyway - cv::gapi::ie::backend() still needs to be defined
#include "opencv2/gapi/infer/ie.hpp" #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 <ade/util/algorithm.hpp> // type_list_index
#include <condition_variable> #include <condition_variable>

4
modules/gapi/src/backends/ie/giebackend/giewrapper.cpp
Unescape View File

@ -2,9 +2,9 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory // 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. // 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 <vector>
#include <string> #include <string>

2
modules/gapi/test/infer/gapi_infer_ie_test.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save