Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
af95395f
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
af95395f
编写于
6月 07, 2023
作者:
T
TolyaTalamanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ifdef condition
上级
6b53fe8f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
9 deletion
+9
-9
modules/gapi/src/backends/ov/govbackend.cpp
modules/gapi/src/backends/ov/govbackend.cpp
+3
-3
modules/gapi/src/backends/ov/govbackend.hpp
modules/gapi/src/backends/ov/govbackend.hpp
+2
-2
modules/gapi/src/backends/ov/util.hpp
modules/gapi/src/backends/ov/util.hpp
+2
-2
modules/gapi/test/infer/gapi_infer_ov_tests.cpp
modules/gapi/test/infer/gapi_infer_ov_tests.cpp
+2
-2
未找到文件。
modules/gapi/src/backends/ov/govbackend.cpp
浏览文件 @
af95395f
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
// (cv::gapi::ov::backend() is still there and is defined always)
// (cv::gapi::ov::backend() is still there and is defined always)
#include "backends/ov/govbackend.hpp"
#include "backends/ov/govbackend.hpp"
#if
def HAVE_INF_ENGINE
#if
defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE >= 2022010000
#include "backends/ov/util.hpp"
#include "backends/ov/util.hpp"
#include "api/gbackend_priv.hpp" // FIXME: Make it part of Backend SDK!
#include "api/gbackend_priv.hpp" // FIXME: Make it part of Backend SDK!
...
@@ -991,11 +991,11 @@ void cv::gimpl::ov::GOVExecutable::run(cv::gimpl::GIslandExecutable::IInput &in
...
@@ -991,11 +991,11 @@ void cv::gimpl::ov::GOVExecutable::run(cv::gimpl::GIslandExecutable::IInput &in
}
}
}
}
#else // HAVE_INF_ENGINE
#else // HAVE_INF_ENGINE
&& INF_ENGINE_RELEASE >= 2022010000
cv
::
gapi
::
GBackend
cv
::
gapi
::
ov
::
backend
()
{
cv
::
gapi
::
GBackend
cv
::
gapi
::
ov
::
backend
()
{
// Still provide this symbol to avoid linking issues
// Still provide this symbol to avoid linking issues
util
::
throw_error
(
std
::
runtime_error
(
"G-API has been compiled without OpenVINO support"
));
util
::
throw_error
(
std
::
runtime_error
(
"G-API has been compiled without OpenVINO support"
));
}
}
#endif // HAVE_INF_ENGINE
#endif // HAVE_INF_ENGINE
&& INF_ENGINE_RELEASE >= 2022010000
modules/gapi/src/backends/ov/govbackend.hpp
浏览文件 @
af95395f
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
// Include anyway - cv::gapi::ov::backend() still needs to be defined
// Include anyway - cv::gapi::ov::backend() still needs to be defined
#include "opencv2/gapi/infer/ov.hpp"
#include "opencv2/gapi/infer/ov.hpp"
#if
def HAVE_INF_ENGINE
#if
defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE >= 2022010000
#include <openvino/openvino.hpp>
#include <openvino/openvino.hpp>
...
@@ -62,5 +62,5 @@ public:
...
@@ -62,5 +62,5 @@ public:
}}}
}}}
#endif // HAVE_INF_ENGINE
#endif // HAVE_INF_ENGINE
&& INF_ENGINE_RELEASE >= 2022010000
#endif // OPENCV_GAPI_GOVBACKEND_HPP
#endif // OPENCV_GAPI_GOVBACKEND_HPP
modules/gapi/src/backends/ov/util.hpp
浏览文件 @
af95395f
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#ifndef OPENCV_GAPI_INFER_OV_UTIL_HPP
#ifndef OPENCV_GAPI_INFER_OV_UTIL_HPP
#define OPENCV_GAPI_INFER_OV_UTIL_HPP
#define OPENCV_GAPI_INFER_OV_UTIL_HPP
#if
def HAVE_INF_ENGINE
#if
defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE >= 2022010000
// NOTE: This file is not included by default in infer/ov.hpp
// NOTE: This file is not included by default in infer/ov.hpp
// and won't be. infer/ov.hpp doesn't depend on OV headers itself.
// and won't be. infer/ov.hpp doesn't depend on OV headers itself.
...
@@ -30,6 +30,6 @@ GAPI_EXPORTS int to_ocv(const ::ov::element::Type &type);
...
@@ -30,6 +30,6 @@ GAPI_EXPORTS int to_ocv(const ::ov::element::Type &type);
}}}}
}}}}
#endif // HAVE_INF_ENGINE
#endif // HAVE_INF_ENGINE
&& INF_ENGINE_RELEASE >= 2022010000
#endif // OPENCV_GAPI_INFER_OV_UTIL_HPP
#endif // OPENCV_GAPI_INFER_OV_UTIL_HPP
modules/gapi/test/infer/gapi_infer_ov_tests.cpp
浏览文件 @
af95395f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
//
//
// Copyright (C) 2023 Intel Corporation
// Copyright (C) 2023 Intel Corporation
#if
def HAVE_INF_ENGINE
#if
defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE >= 2022010000
#include "../test_precomp.hpp"
#include "../test_precomp.hpp"
...
@@ -537,4 +537,4 @@ TEST(TestAgeGenderOV, InferTensorWithPreproc) {
...
@@ -537,4 +537,4 @@ TEST(TestAgeGenderOV, InferTensorWithPreproc) {
}
// namespace opencv_test
}
// namespace opencv_test
#endif //
HAVE_INF_ENGINE
#endif //
HAVE_INF_ENGINE && INF_ENGINE_RELEASE >= 2022010000
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录