mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 07:13:02 +04:00
Merge pull request #12608 from dmatveev:gapi
* G-API Initial code upload * Update G-API code base to Sep-24-2018 * The majority of OpenCV buildbot problems was addressed * Update G-API code base to 24-Sep-18 EOD * G-API code base update 25-Sep-2018 * Linux warnings should be resolved * Documentation build should become green * Number of Windows warnings should be reduced * Update G-API code base to 25-Sep-18 EOD * ARMv7 build issue should be resolved * ADE is bumped to latest version and should fix Clang builds for macOS/iOS * Remaining Windows warnings should be resolved * New Linux32 / ARMv7 warnings should be resolved * G-API code base update 25-Sep-2018-EOD2 * Final Windows warnings should be resolved now * G-API code base update 26-Sep-2018 * Fixed issues with precompiled headers in module and its tests
This commit is contained in:
Dmitry Matveev
committed by
Alexander Alekhin
Alexander Alekhin
parent
852f061b26
commit
29e88e50ff
@@ -0,0 +1,191 @@
|
||||
// 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) 2018 Intel Corporation
|
||||
|
||||
|
||||
#include <algorithm> // remove_if
|
||||
#include <cctype> // isspace (non-locale version)
|
||||
#include <ade/util/algorithm.hpp>
|
||||
|
||||
#include "opencv2/core/cvdef.h"
|
||||
#include "logger.hpp" // GAPI_LOG
|
||||
|
||||
#include "opencv2/gapi/gcomputation.hpp"
|
||||
#include "opencv2/gapi/gkernel.hpp"
|
||||
|
||||
#include "api/gcomputation_priv.hpp"
|
||||
#include "api/gcall_priv.hpp"
|
||||
#include "api/gnode_priv.hpp"
|
||||
|
||||
#include "compiler/gmodelbuilder.hpp"
|
||||
#include "compiler/gcompiler.hpp"
|
||||
|
||||
// cv::GComputation private implementation /////////////////////////////////////
|
||||
// <none>
|
||||
|
||||
// cv::GComputation public implementation //////////////////////////////////////
|
||||
cv::GComputation::GComputation(const Generator& gen)
|
||||
: m_priv(gen().m_priv)
|
||||
{
|
||||
}
|
||||
|
||||
cv::GComputation::GComputation(GMat in, GMat out)
|
||||
: cv::GComputation(cv::GIn(in), cv::GOut(out))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
cv::GComputation::GComputation(GMat in, GScalar out)
|
||||
: cv::GComputation(cv::GIn(in), cv::GOut(out))
|
||||
{
|
||||
}
|
||||
|
||||
cv::GComputation::GComputation(GMat in1, GMat in2, GMat out)
|
||||
: cv::GComputation(cv::GIn(in1, in2), cv::GOut(out))
|
||||
{
|
||||
}
|
||||
|
||||
cv::GComputation::GComputation(GMat in1, GMat in2, GScalar out)
|
||||
: cv::GComputation(cv::GIn(in1, in2), cv::GOut(out))
|
||||
{
|
||||
}
|
||||
|
||||
cv::GComputation::GComputation(const std::vector<GMat> &ins,
|
||||
const std::vector<GMat> &outs)
|
||||
: m_priv(new Priv())
|
||||
{
|
||||
const auto wrap = [](cv::GMat m) { return GProtoArg(m); };
|
||||
ade::util::transform(ins, std::back_inserter(m_priv->m_ins), wrap);
|
||||
ade::util::transform(outs, std::back_inserter(m_priv->m_outs), wrap);
|
||||
}
|
||||
|
||||
cv::GComputation::GComputation(cv::GProtoInputArgs &&ins,
|
||||
cv::GProtoOutputArgs &&outs)
|
||||
: m_priv(new Priv())
|
||||
{
|
||||
m_priv->m_ins = std::move(ins.m_args);
|
||||
m_priv->m_outs = std::move(outs.m_args);
|
||||
}
|
||||
|
||||
cv::GCompiled cv::GComputation::compile(GMetaArgs &&metas, GCompileArgs &&args)
|
||||
{
|
||||
// FIXME: Cache gcompiled per parameters here?
|
||||
cv::gimpl::GCompiler comp(*this, std::move(metas), std::move(args));
|
||||
return comp.compile();
|
||||
}
|
||||
|
||||
void cv::GComputation::apply(GRunArgs &&ins, GRunArgsP &&outs, GCompileArgs &&args)
|
||||
{
|
||||
const auto in_metas = descr_of(ins);
|
||||
// FIXME Graph should be recompiled when GCompileArgs have changed
|
||||
if (m_priv->m_lastMetas != in_metas)
|
||||
{
|
||||
// FIXME: Had to construct temporary object as compile() takes && (r-value)
|
||||
m_priv->m_lastCompiled = compile(GMetaArgs(in_metas), std::move(args));
|
||||
m_priv->m_lastMetas = in_metas; // Update only here, if compile() was ok
|
||||
}
|
||||
m_priv->m_lastCompiled(std::move(ins), std::move(outs));
|
||||
}
|
||||
|
||||
void cv::GComputation::apply(cv::Mat in, cv::Mat &out, GCompileArgs &&args)
|
||||
{
|
||||
apply(cv::gin(in), cv::gout(out), std::move(args));
|
||||
// FIXME: The following doesn't work!
|
||||
// Operation result is not replicated into user's object
|
||||
// apply({GRunArg(in)}, {GRunArg(out)});
|
||||
}
|
||||
|
||||
void cv::GComputation::apply(cv::Mat in, cv::Scalar &out, GCompileArgs &&args)
|
||||
{
|
||||
apply(cv::gin(in), cv::gout(out), std::move(args));
|
||||
}
|
||||
|
||||
void cv::GComputation::apply(cv::Mat in1, cv::Mat in2, cv::Mat &out, GCompileArgs &&args)
|
||||
{
|
||||
apply(cv::gin(in1, in2), cv::gout(out), std::move(args));
|
||||
}
|
||||
|
||||
void cv::GComputation::apply(cv::Mat in1, cv::Mat in2, cv::Scalar &out, GCompileArgs &&args)
|
||||
{
|
||||
apply(cv::gin(in1, in2), cv::gout(out), std::move(args));
|
||||
}
|
||||
|
||||
void cv::GComputation::apply(const std::vector<cv::Mat> &ins,
|
||||
const std::vector<cv::Mat> &outs,
|
||||
GCompileArgs &&args)
|
||||
{
|
||||
GRunArgs call_ins;
|
||||
GRunArgsP call_outs;
|
||||
|
||||
// Make a temporary copy of vector outs - cv::Mats are copies anyway
|
||||
auto tmp = outs;
|
||||
for (const cv::Mat &m : ins) { call_ins.emplace_back(m); }
|
||||
for ( cv::Mat &m : tmp) { call_outs.emplace_back(&m); }
|
||||
|
||||
apply(std::move(call_ins), std::move(call_outs), std::move(args));
|
||||
}
|
||||
|
||||
cv::GComputation::Priv& cv::GComputation::priv()
|
||||
{
|
||||
return *m_priv;
|
||||
}
|
||||
|
||||
const cv::GComputation::Priv& cv::GComputation::priv() const
|
||||
{
|
||||
return *m_priv;
|
||||
}
|
||||
|
||||
// Islands /////////////////////////////////////////////////////////////////////
|
||||
|
||||
void cv::gapi::island(const std::string &name,
|
||||
GProtoInputArgs &&ins,
|
||||
GProtoOutputArgs &&outs)
|
||||
{
|
||||
{
|
||||
// Island must have a printable name.
|
||||
// Forbid names which contain only spaces.
|
||||
GAPI_Assert(!name.empty());
|
||||
const auto first_printable_it = std::find_if_not(name.begin(), name.end(), isspace);
|
||||
const bool likely_printable = first_printable_it != name.end();
|
||||
GAPI_Assert(likely_printable);
|
||||
}
|
||||
// Even if the name contains spaces, keep it unmodified as user will
|
||||
// then use this string to assign affinity, etc.
|
||||
|
||||
// First, set island tags on all operations from `ins` to `outs`
|
||||
auto island = cv::gimpl::unrollExpr(ins.m_args, outs.m_args);
|
||||
if (island.all_ops.empty())
|
||||
{
|
||||
util::throw_error(std::logic_error("Operation range is empty"));
|
||||
}
|
||||
for (auto &op_expr_node : island.all_ops)
|
||||
{
|
||||
auto &op_expr_node_p = op_expr_node.priv();
|
||||
|
||||
GAPI_Assert(op_expr_node.shape() == GNode::NodeShape::CALL);
|
||||
const GCall& call = op_expr_node.call();
|
||||
const GCall::Priv& call_p = call.priv();
|
||||
|
||||
if (!op_expr_node_p.m_island.empty())
|
||||
{
|
||||
util::throw_error(std::logic_error
|
||||
( "Operation " + call_p.m_k.name
|
||||
+ " is already assigned to island \""
|
||||
+ op_expr_node_p.m_island + "\""));
|
||||
}
|
||||
else
|
||||
{
|
||||
op_expr_node_p.m_island = name;
|
||||
GAPI_LOG_INFO(NULL,
|
||||
"Assigned " << call_p.m_k.name << "_" << &call_p <<
|
||||
" to island \"" << name << "\"");
|
||||
}
|
||||
}
|
||||
|
||||
// Note - this function only sets islands to all operations in
|
||||
// expression tree, it is just a first step.
|
||||
// The second step is assigning intermediate data objects to Islands,
|
||||
// see passes::initIslands for details.
|
||||
}
|
||||
Reference in New Issue
Block a user