Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

G-API: Expose explicit preprocessing for IE Backend #23786

Merged
merged 8 commits into from
Jun 14, 2023
Merged

G-API: Expose explicit preprocessing for IE Backend #23786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc66346
Explicit preprocessing for IE backend
TolyaTalamanov Jun 12, 2023
9946ef1
Add dims alignment
TolyaTalamanov Jun 12, 2023
4392782
Prohibit preprocessing for InferList2
TolyaTalamanov Jun 12, 2023
02181ca
Add preprocessing to generic params
TolyaTalamanov Jun 12, 2023
4a467cd
Update modules/gapi/include/opencv2/gapi/infer/ie.hpp
TolyaTalamanov Jun 12, 2023
ea67ee5
Add todo for lookup function
TolyaTalamanov Jun 12, 2023
ece2f19
Update copyright
TolyaTalamanov Jun 12, 2023
2bd4d84
Align IE/CV dims based on layout
TolyaTalamanov Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
143 changes: 140 additions & 3 deletions modules/gapi/include/opencv2/gapi/infer/ie.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) 2019-2021 Intel Corporation
// Copyright (C) 2019-2023 Intel Corporation

#ifndef OPENCV_GAPI_INFER_IE_HPP
#define OPENCV_GAPI_INFER_IE_HPP
Expand Down Expand Up @@ -55,6 +55,21 @@ using IEConfig = std::map<std::string, std::string>;
enum InferMode {Sync, Async};

namespace detail {

template <typename T>
using AttrMap = std::map<std::string, T>;
// NB: This type is used to hold in/out layers
// attributes such as precision, layout, shape etc.
//
// User can provide attributes either:
// 1. cv::util::monostate - No value specified explicitly.
// 2. Attr - value specified explicitly that should be broadcasted to all layers.
// 3. AttrMap[str->T] - map specifies value for particular layer.
template <typename Attr>
using LayerVariantAttr = cv::util::variant< cv::util::monostate
, AttrMap<Attr>
, Attr>;

struct ParamDesc {
std::string model_path;
std::string weights_path;
Expand Down Expand Up @@ -103,7 +118,11 @@ struct ParamDesc {
using PrecisionVariantT = cv::util::variant<cv::util::monostate,
PrecisionT,
PrecisionMapT>;

PrecisionVariantT output_precision;
LayerVariantAttr<std::string> input_layout;
LayerVariantAttr<std::string> output_layout;
LayerVariantAttr<int> interpolation;
};
} // namespace detail

Expand Down Expand Up @@ -150,6 +169,9 @@ template<typename Net> class Params {
, {}
, {}
, InferMode::Async
, {}
, {}
, {}
dmatveev marked this conversation as resolved.
Show resolved Hide resolved
, {} } {
};

Expand All @@ -176,6 +198,9 @@ template<typename Net> class Params {
, {}
, {}
, InferMode::Async
, {}
, {}
, {}
, {} } {
};

Expand Down Expand Up @@ -412,6 +437,80 @@ template<typename Net> class Params {
return *this;
}

/** @brief Specifies the input layout for model.

The function is used to set an input layout for model.

@param layout Layout in string representation ("NCHW", "NHWC", etc)
will be applied to all input layers.
@return reference to this parameter structure.
*/
Params<Net>& cfgInputLayout(std::string layout) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't be exposed to python because IE backend is going to be deprecated soon...

desc.input_layout = std::move(layout);
return *this;
}

/** @overload

@param layout_map Map of pairs: name of corresponding input layer
and its layout in string representation ("NCHW", "NHWC", etc)
@return reference to this parameter structure.
*/
Params<Net>&
cfgInputLayout(detail::AttrMap<std::string> layout_map) {
TolyaTalamanov marked this conversation as resolved.
Show resolved Hide resolved
desc.input_layout = std::move(layout_map);
return *this;
}

/** @brief Specifies the output layout for model.

The function is used to set an output layout for model.

@param layout Layout in string representation ("NCHW", "NHWC", etc)
will be applied to all output layers.
@return reference to this parameter structure.
*/
Params<Net>& cfgOutputLayout(std::string layout) {
desc.output_layout = std::move(layout);
return *this;
}

/** @overload

@param layout_map Map of pairs: name of corresponding output layer
and its layout in string representation ("NCHW", "NHWC", etc)
@return reference to this parameter structure.
*/
Params<Net>&
cfgOutputLayout(detail::AttrMap<std::string> layout_map) {
desc.output_layout = std::move(layout_map);
return *this;
}

/** @brief Specifies resize interpolation algorithm.
*
The function is used to configure resize preprocessing for input layer.

@param interpolation Resize interpolation algorithm.
Supported algorithms: #INTER_LINEAR, #INTER_AREA.
@return reference to this parameter structure.
*/
Params<Net>& cfgResize(int interpolation) {
desc.interpolation = interpolation;
return *this;
}

/** @overload

@param interpolation Map of pairs: name of corresponding input layer
and its resize algorithm.
@return reference to this parameter structure.
*/
Params<Net>& cfgResize(detail::AttrMap<int> interpolation) {
desc.interpolation = std::move(interpolation);
return *this;
}

// BEGIN(G-API's network parametrization API)
GBackend backend() const { return cv::gapi::ie::backend(); }
std::string tag() const { return Net::tag(); }
Expand Down Expand Up @@ -446,7 +545,7 @@ class Params<cv::gapi::Generic> {
const std::string &device)
: desc{ model, weights, device, {}, {}, {}, 0u, 0u,
detail::ParamDesc::Kind::Load, true, {}, {}, {}, 1u,
{}, {}, {}, {}, InferMode::Async, {} },
{}, {}, {}, {}, InferMode::Async, {}, {}, {}, {} },
m_tag(tag) {
};

Expand All @@ -464,7 +563,7 @@ class Params<cv::gapi::Generic> {
const std::string &device)
: desc{ model, {}, device, {}, {}, {}, 0u, 0u,
detail::ParamDesc::Kind::Import, true, {}, {}, {}, 1u,
{}, {}, {}, {}, InferMode::Async, {} },
{}, {}, {}, {}, InferMode::Async, {}, {}, {}, {} },
m_tag(tag) {
};

Expand Down Expand Up @@ -556,6 +655,44 @@ class Params<cv::gapi::Generic> {
return *this;
}

/** @see ie::Params::cfgInputLayout */
Params& cfgInputLayout(std::string layout) {
desc.input_layout = std::move(layout);
return *this;
}

/** @overload */
Params&
cfgInputLayout(detail::AttrMap<std::string> layout_map) {
desc.input_layout = std::move(layout_map);
return *this;
}

/** @see ie::Params::cfgOutputLayout */
Params& cfgOutputLayout(std::string layout) {
desc.output_layout = std::move(layout);
return *this;
}

/** @overload */
Params&
cfgOutputLayout(detail::AttrMap<std::string> layout_map) {
desc.output_layout = std::move(layout_map);
return *this;
}

/** @see ie::Params::cfgResize */
Params& cfgResize(int interpolation) {
desc.interpolation = interpolation;
return *this;
}

/** @overload */
Params& cfgResize(detail::AttrMap<int> interpolation) {
desc.interpolation = std::move(interpolation);
return *this;
}

// BEGIN(G-API's network parametrization API)
GBackend backend() const { return cv::gapi::ie::backend(); }
std::string tag() const { return m_tag; }
Expand Down