|
|
|
// 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) 2019 Intel Corporation
|
|
|
|
|
|
|
|
#include <tuple>
|
|
|
|
|
|
|
|
#include "test_precomp.hpp"
|
|
|
|
#include "opencv2/gapi/gtransform.hpp"
|
|
|
|
#include "opencv2/gapi/gtype_traits.hpp"
|
|
|
|
// explicit include to use GComputation::Priv
|
|
|
|
#include "api/gcomputation_priv.hpp"
|
|
|
|
|
|
|
|
namespace opencv_test
|
|
|
|
{
|
|
|
|
|
|
|
|
namespace
|
|
|
|
{
|
|
|
|
using GMat = cv::GMat;
|
|
|
|
using GMat2 = std::tuple<GMat, GMat>;
|
|
|
|
using GMat3 = std::tuple<GMat, GMat, GMat>;
|
|
|
|
using GScalar = cv::GScalar;
|
|
|
|
template <typename T> using GArray = cv::GArray<T>;
|
|
|
|
template <typename T> using GOpaque = cv::GOpaque<T>;
|
|
|
|
|
|
|
|
using ArrayT = int;
|
|
|
|
using WrongArrayT = char;
|
|
|
|
|
|
|
|
struct CustomType{
|
|
|
|
cv::Mat mat;
|
|
|
|
int i;
|
|
|
|
void *v;
|
|
|
|
CustomType* next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct AnotherCustomType{
|
|
|
|
cv::Mat mat;
|
|
|
|
int i;
|
|
|
|
void *v;
|
|
|
|
};
|
|
|
|
|
|
|
|
using OpaqueT = CustomType;
|
|
|
|
using WrongOpaqueT = AnotherCustomType;
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat_in_gmat_out, <GMat(GMat)>, "gmat_in_gmat_out")
|
|
|
|
{
|
|
|
|
static GMat pattern(GMat) { return {}; }
|
|
|
|
static GMat substitute(GMat) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat2_in_gmat_out, <GMat(GMat, GMat)>, "gmat2_in_gmat_out")
|
|
|
|
{
|
|
|
|
static GMat pattern(GMat, GMat) { return {}; }
|
|
|
|
static GMat substitute(GMat, GMat) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat2_in_gmat3_out, <GMat3(GMat, GMat)>, "gmat2_in_gmat3_out")
|
|
|
|
{
|
|
|
|
static GMat3 pattern(GMat, GMat) { return {}; }
|
|
|
|
static GMat3 substitute(GMat, GMat) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmatp_in_gmatp_out, <GMatP(GMatP)>, "gmatp_in_gmatp_out")
|
|
|
|
{
|
|
|
|
static GMatP pattern(GMatP) { return {}; }
|
|
|
|
static GMatP substitute(GMatP) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gsc_in_gmat_out, <GMat(GScalar)>, "gsc_in_gmat_out")
|
|
|
|
{
|
|
|
|
static GMat pattern(GScalar) { return {}; }
|
|
|
|
static GMat substitute(GScalar) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat_in_gsc_out, <GScalar(GMat)>, "gmat_in_gsc_out")
|
|
|
|
{
|
|
|
|
static GScalar pattern(GMat) { return {}; }
|
|
|
|
static GScalar substitute(GMat) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(garr_in_gmat_out, <GMat(GArray<ArrayT>)>, "garr_in_gmat_out")
|
|
|
|
{
|
|
|
|
static GMat pattern(GArray<ArrayT>) { return {}; }
|
|
|
|
static GMat substitute(GArray<ArrayT>) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat_in_garr_out, <GArray<ArrayT>(GMat)>, "gmat_in_garr_out")
|
|
|
|
{
|
|
|
|
static GArray<ArrayT> pattern(GMat) { return {}; }
|
|
|
|
static GArray<ArrayT> substitute(GMat) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(garr_in_gscalar_out, <GScalar(GArray<ArrayT>)>, "garr_in_gscalar_out")
|
|
|
|
{
|
|
|
|
static GScalar pattern(GArray<ArrayT>) { return {}; }
|
|
|
|
static GScalar substitute(GArray<ArrayT>) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gscalar_in_garr_out, <GArray<ArrayT>(GScalar)>, "gscalar_in_garr_out")
|
|
|
|
{
|
|
|
|
static GArray<ArrayT> pattern(GScalar) { return {}; }
|
|
|
|
static GArray<ArrayT> substitute(GScalar) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat_gsc_garray_in_gmat2_out, <GMat2(GMat, GScalar, GArray<ArrayT>)>, "gmat_gsc_garray_in_gmat2_out")
|
|
|
|
{
|
|
|
|
static GMat2 pattern(GMat, GScalar, GArray<ArrayT>) { return {}; }
|
|
|
|
static GMat2 substitute(GMat, GScalar, GArray<ArrayT>) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gop_in_gmat_out, <GMat(GOpaque<OpaqueT>)>, "gop_in_gmat_out")
|
|
|
|
{
|
|
|
|
static GMat pattern(GOpaque<OpaqueT>) { return {}; }
|
|
|
|
static GMat substitute(GOpaque<OpaqueT>) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat_in_gop_out, <GOpaque<OpaqueT>(GMat)>, "gmat_in_gop_out")
|
|
|
|
{
|
|
|
|
static GOpaque<OpaqueT> pattern(GMat) { return {}; }
|
|
|
|
static GOpaque<OpaqueT> substitute(GMat) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gop_in_gscalar_out, <GScalar(GOpaque<OpaqueT>)>, "gop_in_gscalar_out")
|
|
|
|
{
|
|
|
|
static GScalar pattern(GOpaque<OpaqueT>) { return {}; }
|
|
|
|
static GScalar substitute(GOpaque<OpaqueT>) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gscalar_in_gop_out, <GOpaque<OpaqueT>(GScalar)>, "gscalar_in_gop_out")
|
|
|
|
{
|
|
|
|
static GOpaque<OpaqueT> pattern(GScalar) { return {}; }
|
|
|
|
static GOpaque<OpaqueT> substitute(GScalar) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
GAPI_TRANSFORM(gmat_gsc_gopaque_in_gmat2_out, <GMat2(GMat, GScalar, GOpaque<OpaqueT>)>, "gmat_gsc_gopaque_in_gmat2_out")
|
|
|
|
{
|
|
|
|
static GMat2 pattern(GMat, GScalar, GOpaque<OpaqueT>) { return {}; }
|
|
|
|
static GMat2 substitute(GMat, GScalar, GOpaque<OpaqueT>) { return {}; }
|
|
|
|
};
|
|
|
|
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, CreatePackage)
|
|
|
|
{
|
|
|
|
auto pkg = cv::gapi::kernels
|
|
|
|
< gmat_in_gmat_out
|
|
|
|
, gmat2_in_gmat_out
|
|
|
|
, gmat2_in_gmat3_out
|
|
|
|
, gmatp_in_gmatp_out
|
|
|
|
, gsc_in_gmat_out
|
|
|
|
, gmat_in_gsc_out
|
|
|
|
, garr_in_gmat_out
|
|
|
|
, gmat_in_garr_out
|
|
|
|
, garr_in_gscalar_out
|
|
|
|
, gscalar_in_garr_out
|
|
|
|
, gmat_gsc_garray_in_gmat2_out
|
|
|
|
, gop_in_gmat_out
|
|
|
|
, gmat_in_gop_out
|
|
|
|
, gop_in_gscalar_out
|
|
|
|
, gscalar_in_gop_out
|
|
|
|
, gmat_gsc_gopaque_in_gmat2_out
|
|
|
|
>();
|
|
|
|
|
|
|
|
auto tr = pkg.get_transformations();
|
|
|
|
EXPECT_EQ(16u, tr.size());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, Include)
|
|
|
|
{
|
|
|
|
cv::gapi::GKernelPackage pkg;
|
|
|
|
pkg.include<gmat_in_gmat_out>();
|
|
|
|
pkg.include<gmat2_in_gmat_out>();
|
|
|
|
pkg.include<gmat2_in_gmat3_out>();
|
|
|
|
auto tr = pkg.get_transformations();
|
|
|
|
EXPECT_EQ(3u, tr.size());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, Combine)
|
|
|
|
{
|
|
|
|
auto pkg1 = cv::gapi::kernels<gmat_in_gmat_out>();
|
|
|
|
auto pkg2 = cv::gapi::kernels<gmat2_in_gmat_out>();
|
|
|
|
auto pkg_comb = cv::gapi::combine(pkg1, pkg2);
|
|
|
|
auto tr = pkg_comb.get_transformations();
|
|
|
|
EXPECT_EQ(2u, tr.size());
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace
|
|
|
|
{
|
|
|
|
template <typename T>
|
|
|
|
inline bool ProtoContainsT(const cv::GProtoArg &arg) {
|
|
|
|
return cv::GProtoArg::index_of<T>() == arg.index();
|
|
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmat_gsc_garray_in_gmat2_out)
|
|
|
|
{
|
|
|
|
auto tr = gmat_gsc_garray_in_gmat2_out::transformation();
|
|
|
|
|
|
|
|
auto check = [](const cv::GComputation &comp){
|
Merge pull request #17020 from dbudniko:dbudniko/serialization_backend
G-API Serialization routines
* Serialization backend in tests, initial version
* S11N/00: A Great Rename
- "Serialization" is too long and too error-prone to type,
so now it is renamed to "s11n" everywhere;
- Same applies to "SRLZ";
- Tests also renamed to start with 'S11N.*' (easier to run);
- Also updated copyright years in new files to 2020.
* S11N/01: Some basic interface segregation
- Moved some details (low-level functions) out of serialization.hpp;
- Introduced I::IStream and I::OStream interfaces;
- Implemented those via the existing [De]SerializationStream classes;
- Moved all operators to use interfaces instead of classes;
- Moved the htonl/ntohl handling out of operators (to the classes).
The implementation didn't change much, it is a subject to the further
refactoring
* S11N/02: Basic operator reorg, basic tests, vector support
- Reorganized operators on atomic types to follow >>/<< model
(put them closer in the code for the respective types);
- Introduce more operators for basic (scalar) types;
- Drop all vector s11n overloads -- replace with a generic
(template-based) one;
- Introduced a new test suite where low-level s11n functionality
is tested (for the basic types).
* S11N/03: Operators reorganization
- Sorted the Opaque types enum by complexity;
- Reorganized the existing operators for basic types, also ordered by
complexity;
- Organized operators in three groups (Basics, OpenCV, G-API);
- Added a generic serialization for variant<>;
- Reimplemented some of the existing operators (for OpenCV and G-API
data structures);
- Introduced new operators for cv::gimpl data types. These operators
(and so, the data structures) are not yet used in the graph
dump/reconstruction routine, it will be done as a next step.
* S11N/04: The Great Clean-up
- Drop the duplicates of GModel data structures from the
serialization, serialize the GModel data structures themselve
instead (hand-written code replaced with operators).
- Also removed usuned code for printing, etc.
* S11N/05: Internal API Clean-up
- Minimize the serialization API to just Streams and Operators;
- Refactor and fix the graph serialization (deconstruction and
reconstruction) routines, fix data addressing problems there;
- Move the serialization.[ch]pp files to the core G-API library
* S11N/06: Top-level API introduction
- !!!This is likely the most invasive commit in the series!!!
- Introduced a top-level API to serialize and deserialize a GComputation
- Extended the compiler to support both forms of a GComputation:
an expession based and a deserialized one. This has led to changes in
the cv::GComputation::Priv and in its dependent components (even the
transformation tests);
- Had to extend the kernel API (GKernel) with extra information on
operations (mainly `outMeta`) which was only available for expression
based graphs. Now the `outMeta` can be taken from kernels too (and for
the deserialized graphs it is the only way);
- Revisited the internal serialization API, had to expose previously
hidden entities (like `GSerialized`);
- Extended the serialized graph info with new details (object counter,
protocol). Added unordered_map generic serialization for that;
- Reworked the very first pipeline test to be "proper"; GREEN now, the rest
is to be reworked in the next iteration.
* S11N/07: Tests reworked
- Moved the sample pipeline tests w/serialization to
test the public API (`cv::gapi::serialize`, then
followed by `cv::gapi::deserialize<>`). All GREEN.
- As a consequence, dropped the "Serialization" test
backend as no longer necessary.
* S11N/08: Final touches
- Exposed the C++ native data types at Streams level;
- Switched the ByteMemoryIn/OutStreams to store data in `char`
internally (2x less memory for sample pipelines);
- Fixed and refactored Mat dumping to the stream;
- Renamed S11N pipeline tests to their new meaning.
* linux build fix
* fix RcDesc and int uint warnings
* more Linux build fix
* white space and virtual android error fix (attempt)
* more warnings to be fixed
* android warnings fix attempt
* one more attempt for android build fix
* android warnings one more fix
* return back override
* avoid size_t
* static deserialize
* and how do you like this, elon? anonymous namespace to fix android warning.
* static inline
* trying to fix standalone build
* mat dims fix
* fix mat r/w for standalone
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
4 years ago
|
|
|
const auto &p = cv::util::get<cv::GComputation::Priv::Expr>(comp.priv().m_shape);
|
|
|
|
EXPECT_EQ(3u, p.m_ins.size());
|
|
|
|
EXPECT_EQ(2u, p.m_outs.size());
|
|
|
|
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GMat>(p.m_ins[0]));
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GScalar>(p.m_ins[1]));
|
|
|
|
EXPECT_TRUE(ProtoContainsT<cv::detail::GArrayU>(p.m_ins[2]));
|
|
|
|
EXPECT_TRUE(cv::util::get<cv::detail::GArrayU>(p.m_ins[2]).holds<ArrayT>());
|
|
|
|
EXPECT_FALSE(cv::util::get<cv::detail::GArrayU>(p.m_ins[2]).holds<WrongArrayT>());
|
|
|
|
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GMat>(p.m_outs[0]));
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GMat>(p.m_outs[1]));
|
|
|
|
};
|
|
|
|
|
|
|
|
check(tr.pattern());
|
|
|
|
check(tr.substitute());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmat_gsc_gopaque_in_gmat2_out)
|
|
|
|
{
|
|
|
|
auto tr = gmat_gsc_gopaque_in_gmat2_out::transformation();
|
|
|
|
|
|
|
|
auto check = [](const cv::GComputation &comp){
|
Merge pull request #17020 from dbudniko:dbudniko/serialization_backend
G-API Serialization routines
* Serialization backend in tests, initial version
* S11N/00: A Great Rename
- "Serialization" is too long and too error-prone to type,
so now it is renamed to "s11n" everywhere;
- Same applies to "SRLZ";
- Tests also renamed to start with 'S11N.*' (easier to run);
- Also updated copyright years in new files to 2020.
* S11N/01: Some basic interface segregation
- Moved some details (low-level functions) out of serialization.hpp;
- Introduced I::IStream and I::OStream interfaces;
- Implemented those via the existing [De]SerializationStream classes;
- Moved all operators to use interfaces instead of classes;
- Moved the htonl/ntohl handling out of operators (to the classes).
The implementation didn't change much, it is a subject to the further
refactoring
* S11N/02: Basic operator reorg, basic tests, vector support
- Reorganized operators on atomic types to follow >>/<< model
(put them closer in the code for the respective types);
- Introduce more operators for basic (scalar) types;
- Drop all vector s11n overloads -- replace with a generic
(template-based) one;
- Introduced a new test suite where low-level s11n functionality
is tested (for the basic types).
* S11N/03: Operators reorganization
- Sorted the Opaque types enum by complexity;
- Reorganized the existing operators for basic types, also ordered by
complexity;
- Organized operators in three groups (Basics, OpenCV, G-API);
- Added a generic serialization for variant<>;
- Reimplemented some of the existing operators (for OpenCV and G-API
data structures);
- Introduced new operators for cv::gimpl data types. These operators
(and so, the data structures) are not yet used in the graph
dump/reconstruction routine, it will be done as a next step.
* S11N/04: The Great Clean-up
- Drop the duplicates of GModel data structures from the
serialization, serialize the GModel data structures themselve
instead (hand-written code replaced with operators).
- Also removed usuned code for printing, etc.
* S11N/05: Internal API Clean-up
- Minimize the serialization API to just Streams and Operators;
- Refactor and fix the graph serialization (deconstruction and
reconstruction) routines, fix data addressing problems there;
- Move the serialization.[ch]pp files to the core G-API library
* S11N/06: Top-level API introduction
- !!!This is likely the most invasive commit in the series!!!
- Introduced a top-level API to serialize and deserialize a GComputation
- Extended the compiler to support both forms of a GComputation:
an expession based and a deserialized one. This has led to changes in
the cv::GComputation::Priv and in its dependent components (even the
transformation tests);
- Had to extend the kernel API (GKernel) with extra information on
operations (mainly `outMeta`) which was only available for expression
based graphs. Now the `outMeta` can be taken from kernels too (and for
the deserialized graphs it is the only way);
- Revisited the internal serialization API, had to expose previously
hidden entities (like `GSerialized`);
- Extended the serialized graph info with new details (object counter,
protocol). Added unordered_map generic serialization for that;
- Reworked the very first pipeline test to be "proper"; GREEN now, the rest
is to be reworked in the next iteration.
* S11N/07: Tests reworked
- Moved the sample pipeline tests w/serialization to
test the public API (`cv::gapi::serialize`, then
followed by `cv::gapi::deserialize<>`). All GREEN.
- As a consequence, dropped the "Serialization" test
backend as no longer necessary.
* S11N/08: Final touches
- Exposed the C++ native data types at Streams level;
- Switched the ByteMemoryIn/OutStreams to store data in `char`
internally (2x less memory for sample pipelines);
- Fixed and refactored Mat dumping to the stream;
- Renamed S11N pipeline tests to their new meaning.
* linux build fix
* fix RcDesc and int uint warnings
* more Linux build fix
* white space and virtual android error fix (attempt)
* more warnings to be fixed
* android warnings fix attempt
* one more attempt for android build fix
* android warnings one more fix
* return back override
* avoid size_t
* static deserialize
* and how do you like this, elon? anonymous namespace to fix android warning.
* static inline
* trying to fix standalone build
* mat dims fix
* fix mat r/w for standalone
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
4 years ago
|
|
|
const auto &p = cv::util::get<cv::GComputation::Priv::Expr>(comp.priv().m_shape);
|
|
|
|
EXPECT_EQ(3u, p.m_ins.size());
|
|
|
|
EXPECT_EQ(2u, p.m_outs.size());
|
|
|
|
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GMat>(p.m_ins[0]));
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GScalar>(p.m_ins[1]));
|
|
|
|
EXPECT_TRUE(ProtoContainsT<cv::detail::GOpaqueU>(p.m_ins[2]));
|
|
|
|
EXPECT_TRUE(cv::util::get<cv::detail::GOpaqueU>(p.m_ins[2]).holds<OpaqueT>());
|
|
|
|
EXPECT_FALSE(cv::util::get<cv::detail::GOpaqueU>(p.m_ins[2]).holds<WrongOpaqueT>());
|
|
|
|
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GMat>(p.m_outs[0]));
|
|
|
|
EXPECT_TRUE(ProtoContainsT<GMat>(p.m_outs[1]));
|
|
|
|
};
|
|
|
|
|
|
|
|
check(tr.pattern());
|
|
|
|
check(tr.substitute());
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace
|
|
|
|
{
|
|
|
|
template<typename ArgT>
|
|
|
|
typename std::enable_if<(cv::detail::GTypeTraits<ArgT>::kind == cv::detail::ArgKind::GARRAY), void>::type
|
|
|
|
arg_check(const cv::GProtoArg &arg)
|
|
|
|
{
|
|
|
|
EXPECT_TRUE(ProtoContainsT<cv::detail::GArrayU>(arg));
|
|
|
|
EXPECT_TRUE(cv::util::get<cv::detail::GArrayU>(arg).holds<ArrayT>());
|
|
|
|
EXPECT_FALSE(cv::util::get<cv::detail::GArrayU>(arg).holds<WrongArrayT>());
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename ArgT>
|
|
|
|
typename std::enable_if<(cv::detail::GTypeTraits<ArgT>::kind == cv::detail::ArgKind::GOPAQUE), void>::type
|
|
|
|
arg_check(const cv::GProtoArg &arg)
|
|
|
|
{
|
|
|
|
EXPECT_TRUE(ProtoContainsT<cv::detail::GOpaqueU>(arg));
|
|
|
|
EXPECT_TRUE(cv::util::get<cv::detail::GOpaqueU>(arg).holds<OpaqueT>());
|
|
|
|
EXPECT_FALSE(cv::util::get<cv::detail::GOpaqueU>(arg).holds<WrongOpaqueT>());
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename ArgT>
|
|
|
|
typename std::enable_if<(cv::detail::GTypeTraits<ArgT>::kind != cv::detail::ArgKind::GARRAY &&
|
|
|
|
cv::detail::GTypeTraits<ArgT>::kind != cv::detail::ArgKind::GOPAQUE), void>::type
|
|
|
|
arg_check(const cv::GProtoArg &arg)
|
|
|
|
{
|
|
|
|
EXPECT_TRUE(ProtoContainsT<ArgT>(arg));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename InType, typename OutType>
|
|
|
|
void args_check(const cv::GComputation &comp)
|
|
|
|
{
|
Merge pull request #17020 from dbudniko:dbudniko/serialization_backend
G-API Serialization routines
* Serialization backend in tests, initial version
* S11N/00: A Great Rename
- "Serialization" is too long and too error-prone to type,
so now it is renamed to "s11n" everywhere;
- Same applies to "SRLZ";
- Tests also renamed to start with 'S11N.*' (easier to run);
- Also updated copyright years in new files to 2020.
* S11N/01: Some basic interface segregation
- Moved some details (low-level functions) out of serialization.hpp;
- Introduced I::IStream and I::OStream interfaces;
- Implemented those via the existing [De]SerializationStream classes;
- Moved all operators to use interfaces instead of classes;
- Moved the htonl/ntohl handling out of operators (to the classes).
The implementation didn't change much, it is a subject to the further
refactoring
* S11N/02: Basic operator reorg, basic tests, vector support
- Reorganized operators on atomic types to follow >>/<< model
(put them closer in the code for the respective types);
- Introduce more operators for basic (scalar) types;
- Drop all vector s11n overloads -- replace with a generic
(template-based) one;
- Introduced a new test suite where low-level s11n functionality
is tested (for the basic types).
* S11N/03: Operators reorganization
- Sorted the Opaque types enum by complexity;
- Reorganized the existing operators for basic types, also ordered by
complexity;
- Organized operators in three groups (Basics, OpenCV, G-API);
- Added a generic serialization for variant<>;
- Reimplemented some of the existing operators (for OpenCV and G-API
data structures);
- Introduced new operators for cv::gimpl data types. These operators
(and so, the data structures) are not yet used in the graph
dump/reconstruction routine, it will be done as a next step.
* S11N/04: The Great Clean-up
- Drop the duplicates of GModel data structures from the
serialization, serialize the GModel data structures themselve
instead (hand-written code replaced with operators).
- Also removed usuned code for printing, etc.
* S11N/05: Internal API Clean-up
- Minimize the serialization API to just Streams and Operators;
- Refactor and fix the graph serialization (deconstruction and
reconstruction) routines, fix data addressing problems there;
- Move the serialization.[ch]pp files to the core G-API library
* S11N/06: Top-level API introduction
- !!!This is likely the most invasive commit in the series!!!
- Introduced a top-level API to serialize and deserialize a GComputation
- Extended the compiler to support both forms of a GComputation:
an expession based and a deserialized one. This has led to changes in
the cv::GComputation::Priv and in its dependent components (even the
transformation tests);
- Had to extend the kernel API (GKernel) with extra information on
operations (mainly `outMeta`) which was only available for expression
based graphs. Now the `outMeta` can be taken from kernels too (and for
the deserialized graphs it is the only way);
- Revisited the internal serialization API, had to expose previously
hidden entities (like `GSerialized`);
- Extended the serialized graph info with new details (object counter,
protocol). Added unordered_map generic serialization for that;
- Reworked the very first pipeline test to be "proper"; GREEN now, the rest
is to be reworked in the next iteration.
* S11N/07: Tests reworked
- Moved the sample pipeline tests w/serialization to
test the public API (`cv::gapi::serialize`, then
followed by `cv::gapi::deserialize<>`). All GREEN.
- As a consequence, dropped the "Serialization" test
backend as no longer necessary.
* S11N/08: Final touches
- Exposed the C++ native data types at Streams level;
- Switched the ByteMemoryIn/OutStreams to store data in `char`
internally (2x less memory for sample pipelines);
- Fixed and refactored Mat dumping to the stream;
- Renamed S11N pipeline tests to their new meaning.
* linux build fix
* fix RcDesc and int uint warnings
* more Linux build fix
* white space and virtual android error fix (attempt)
* more warnings to be fixed
* android warnings fix attempt
* one more attempt for android build fix
* android warnings one more fix
* return back override
* avoid size_t
* static deserialize
* and how do you like this, elon? anonymous namespace to fix android warning.
* static inline
* trying to fix standalone build
* mat dims fix
* fix mat r/w for standalone
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
4 years ago
|
|
|
const auto &p = cv::util::get<cv::GComputation::Priv::Expr>(comp.priv().m_shape);
|
|
|
|
EXPECT_EQ(1u, p.m_ins.size());
|
|
|
|
EXPECT_EQ(1u, p.m_outs.size());
|
|
|
|
arg_check<InType>(p.m_ins[0]);
|
|
|
|
arg_check<OutType>(p.m_outs[0]);
|
|
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
template <typename Transformation, typename InType, typename OutType>
|
|
|
|
static void transformTest()
|
|
|
|
{
|
|
|
|
auto tr = Transformation::transformation();
|
|
|
|
|
|
|
|
args_check<InType, OutType>(tr.pattern());
|
|
|
|
args_check<InType, OutType>(tr.substitute());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmat_in_gmat_out)
|
|
|
|
{
|
|
|
|
transformTest<gmat_in_gmat_out, GMat, GMat>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmatp_in_gmatp_out)
|
|
|
|
{
|
|
|
|
transformTest<gmatp_in_gmatp_out, GMatP, GMatP>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gsc_in_gmat_out)
|
|
|
|
{
|
|
|
|
transformTest<gsc_in_gmat_out, GScalar, GMat>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmat_in_gsc_out)
|
|
|
|
{
|
|
|
|
transformTest<gmat_in_gsc_out, GMat, GScalar>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, garr_in_gmat_out)
|
|
|
|
{
|
|
|
|
transformTest<garr_in_gmat_out, GArray<ArrayT>, GMat>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmat_in_garr_out)
|
|
|
|
{
|
|
|
|
transformTest<gmat_in_garr_out, GMat, GArray<ArrayT>>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, garr_in_gscalar_out)
|
|
|
|
{
|
|
|
|
transformTest<garr_in_gscalar_out, GArray<ArrayT>, GScalar>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gscalar_in_garr_out)
|
|
|
|
{
|
|
|
|
transformTest<gscalar_in_garr_out, GScalar, GArray<ArrayT>>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gop_in_gmat_out)
|
|
|
|
{
|
|
|
|
transformTest<gop_in_gmat_out, GOpaque<OpaqueT>, GMat>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gmat_in_gop_out)
|
|
|
|
{
|
|
|
|
transformTest<gmat_in_gop_out, GMat, GOpaque<OpaqueT>>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gop_in_gscalar_out)
|
|
|
|
{
|
|
|
|
transformTest<gop_in_gscalar_out, GOpaque<OpaqueT>, GScalar>();
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(KernelPackageTransform, gscalar_in_gop_out)
|
|
|
|
{
|
|
|
|
transformTest<gscalar_in_gop_out, GScalar, GOpaque<OpaqueT>>();
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace opencv_test
|