mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 03:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Soften the 0th argument check in infer2

Browse Source
This commit is contained in:
Alexey Smirnov 2023-11-29 12:03:03 +00:00
parent 7833c63388
commit 0a862b5295
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gapi/src/backends/ie/giebackend.cpp
View File

@ -2082,15 +2082,8 @@ struct InferList2: public cv::detail::KernelTag {
? uu.net.getInputsInfo().at(input_name_0)->getTensorDesc() ? uu.net.getInputsInfo().at(input_name_0)->getTensorDesc()
: uu.this_network.GetInputsInfo().at(input_name_0)->getTensorDesc(); : uu.this_network.GetInputsInfo().at(input_name_0)->getTensorDesc();
if (cv::util::holds_alternative<cv::GMatDesc>(mm_0) || if (!(cv::util::holds_alternative<cv::GMatDesc>(mm_0) ||
cv::util::holds_alternative<cv::GFrameDesc>(mm_0)) { cv::util::holds_alternative<cv::GFrameDesc>(mm_0))) {
const auto trait = clarifyTrait(mm_0, tensor_desc_0.getDims());
if (trait != cv::gapi::ie::TraitAs::IMAGE) {
util::throw_error(std::runtime_error(
"IE Backend: Only images is"
" supported as the 0th argument"));
}
} else {
util::throw_error(std::runtime_error( util::throw_error(std::runtime_error(
"IE Backend: Unsupported input meta" "IE Backend: Unsupported input meta"
" for 0th argument in IE backend")); " for 0th argument in IE backend"));
@ -2107,7 +2100,10 @@ struct InferList2: public cv::detail::KernelTag {
&& "Non-array inputs are not supported"); && "Non-array inputs are not supported");
if (op.k.inKinds[idx] == cv::detail::OpaqueKind::CV_RECT) { if (op.k.inKinds[idx] == cv::detail::OpaqueKind::CV_RECT) {
const auto input_trait = cv::gapi::ie::TraitAs::IMAGE; const auto input_trait = clarifyTrait(mm_0, tensor_desc_0.getDims());
GAPI_Assert(input_trait == cv::gapi::ie::TraitAs::IMAGE
&& "IE Backend: Only image is supported as the 0th argument for an input array of cv::Rect");
// NB: Configuring input precision and network reshape must be done // NB: Configuring input precision and network reshape must be done
// only in the loadNetwork case. // only in the loadNetwork case.
if (uu.params.kind == cv::gapi::ie::detail::ParamDesc::Kind::Load) { if (uu.params.kind == cv::gapi::ie::detail::ParamDesc::Kind::Load) {