mirror of
https://github.com/opencv/opencv.git
synced 2025-06-29 08:00:57 +08:00
60848519b5
G-API: Fix incorrect OpaqueKind for Kernel outputs #23843 ### Pull Request Readiness Checklist #### Overview The PR is going to fix several problems: 1. Major: `GKernel` doesn't hold `kind` for its outputs. Since `GModelBuilder` traverse graph from outputs to inputs once it reaches any output of the operation it will use its `kind` to create `Data` meta for all operation outputs. Since it essential for `python` to know `GTypeInfo` (which is `shape` and `kind`) it will be confused. Consider this operation: ``` @cv.gapi.op('custom.square_mean', in_types=[cv.GArray.Int], out_types=[cv.GOpaque.Float, cv.GArray.Int]) class GSquareMean: @staticmethod def outMeta(desc): return cv.empty_gopaque_desc(), cv.empty_array_desc() ``` Even though `GOpaque` is `Float`, corresponding metadata might have `Int` kind because it might be taken from `cv.GArray.Int` so it will be a problem if one of the outputs of these operation is graph output because python will cast it to the wrong type based on `Data` meta. 2. Minor: Some of the OpenVINO `IR`'s doesn't any layout information for input. It's usually true only for `IRv10` but since `OpenVINO 2.0` need this information to correctly configure resize we need to put default layout if there no such assigned in `ov::Model`. See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [ ] I agree to contribute to the project under Apache 2 License. - [ ] 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 - [ ] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
81 lines
2.4 KiB
C++
81 lines
2.4 KiB
C++
// This file is part of OpenCV project.
|
|
// 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
|
|
|
|
|
|
#ifndef OPENCV_GAPI_GSTREAMING_META_HPP
|
|
#define OPENCV_GAPI_GSTREAMING_META_HPP
|
|
|
|
#include <opencv2/gapi/gopaque.hpp>
|
|
#include <opencv2/gapi/gcall.hpp>
|
|
#include <opencv2/gapi/gkernel.hpp>
|
|
#include <opencv2/gapi/gtype_traits.hpp>
|
|
|
|
namespace cv {
|
|
namespace gapi {
|
|
namespace streaming {
|
|
|
|
// FIXME: the name is debatable
|
|
namespace meta_tag {
|
|
static constexpr const char * timestamp = "org.opencv.gapi.meta.timestamp";
|
|
static constexpr const char * seq_id = "org.opencv.gapi.meta.seq_id";
|
|
} // namespace meta_tag
|
|
|
|
namespace detail {
|
|
struct GMeta {
|
|
static const char *id() {
|
|
return "org.opencv.streaming.meta";
|
|
}
|
|
// A universal yield for meta(), same as in GDesync
|
|
template<typename... R, int... IIs>
|
|
static std::tuple<R...> yield(cv::GCall &call, cv::detail::Seq<IIs...>) {
|
|
return std::make_tuple(cv::detail::Yield<R>::yield(call, IIs)...);
|
|
}
|
|
// Also a universal outMeta stub here
|
|
static GMetaArgs getOutMeta(const GMetaArgs &args, const GArgs &) {
|
|
return args;
|
|
}
|
|
};
|
|
} // namespace detail
|
|
|
|
template<typename T, typename G>
|
|
cv::GOpaque<T> meta(G g, const std::string &tag) {
|
|
using O = cv::GOpaque<T>;
|
|
cv::GKernel k{
|
|
detail::GMeta::id() // kernel id
|
|
, tag // kernel tag. Use meta tag here
|
|
, &detail::GMeta::getOutMeta // outMeta callback
|
|
, {cv::detail::GTypeTraits<O>::shape} // output Shape
|
|
, {cv::detail::GTypeTraits<G>::op_kind} // input data kinds
|
|
, {cv::detail::GObtainCtor<O>::get()} // output template ctors
|
|
, {cv::detail::GTypeTraits<O>::op_kind} // output data kind
|
|
};
|
|
cv::GCall call(std::move(k));
|
|
call.pass(g);
|
|
return std::get<0>(detail::GMeta::yield<O>(call, cv::detail::MkSeq<1>::type()));
|
|
}
|
|
|
|
template<typename G>
|
|
cv::GOpaque<int64_t> timestamp(G g) {
|
|
return meta<int64_t>(g, meta_tag::timestamp);
|
|
}
|
|
|
|
template<typename G>
|
|
cv::GOpaque<int64_t> seq_id(G g) {
|
|
return meta<int64_t>(g, meta_tag::seq_id);
|
|
}
|
|
|
|
template<typename G>
|
|
cv::GOpaque<int64_t> seqNo(G g) {
|
|
// Old name, compatibility only
|
|
return seq_id(g);
|
|
}
|
|
|
|
} // namespace streaming
|
|
} // namespace gapi
|
|
} // namespace cv
|
|
|
|
#endif // OPENCV_GAPI_GSTREAMING_META_HPP
|