Skip to content

Commit

Permalink
[Tmpl test] CumSum: enable whole Tensor comparison (openvinotoolkit#2…
Browse files Browse the repository at this point in the history 
…3862)

### Details:
 - Used actual shapes for Tensors creation.

### Tickets:
 - CVS-137153

---------

Co-authored-by: Michal Lukaszewski <michal.lukaszewski@intel.com>
  • Loading branch information
@t-jankowski @mlukasze @alvoron
2 people authored and alvoron committed Apr 29, 2024
1 parent a6d4ed1 commit 4789cae
Showing 1 changed file with 47 additions and 47 deletions.
94 changes: 47 additions & 47 deletions src/plugins/template/tests/functional/op_reference/cum_sum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ namespace {
struct CumSumParams {
// Custom axis input and attributes
template <class IT, class AT>
CumSumParams(const PartialShape& shape,
CumSumParams(const Shape& shape,
const element::Type& iType,
const std::vector<IT>& iValues,
const std::vector<IT>& oValues,
const bool execlusive,
const bool reverse,
const element::Type& axisType,
AT axisVal,
const PartialShape& axisShape)
const Shape& axisShape)
: execlusive(execlusive),
reverse(reverse),
axisValue(axisVal),
Expand All @@ -33,30 +33,30 @@ struct CumSumParams {
inType(iType),
outType(iType),
axisData(CreateTensor(axisType, std::vector<AT>{axisVal})),
inputData(CreateTensor(iType, iValues)),
refData(CreateTensor(iType, oValues)),
inputData(CreateTensor(shape, iType, iValues)),
refData(CreateTensor(shape, iType, oValues)),
testDefaults(false) {}

// Default axis input and attributes
template <class IT>
CumSumParams(const PartialShape& shape,
CumSumParams(const Shape& shape,
const element::Type& iType,
const std::vector<IT>& iValues,
const std::vector<IT>& oValues)
: inShape(shape),
axisType(element::i32),
inType(iType),
outType(iType),
inputData(CreateTensor(iType, iValues)),
refData(CreateTensor(iType, oValues)),
inputData(CreateTensor(shape, iType, iValues)),
refData(CreateTensor(shape, iType, oValues)),
testDefaults(true) {}

bool execlusive = false;
bool reverse = false;
int64_t axisValue = 0;

PartialShape axisShape;
PartialShape inShape;
Shape axisShape;
Shape inShape;
element::Type axisType;
element::Type inType;
element::Type outType;
Expand Down Expand Up @@ -102,9 +102,9 @@ class ReferenceCumSumLayerTest : public testing::TestWithParam<CumSumParams>, pu
}

private:
static std::shared_ptr<Model> CreateFunction(const PartialShape& data_shape,
static std::shared_ptr<Model> CreateFunction(const Shape& data_shape,
const element::Type& data_type,
const PartialShape& axis_shape,
const Shape& axis_shape,
const element::Type& axis_type,
const bool execlusive,
const bool reverse) {
Expand All @@ -114,7 +114,7 @@ class ReferenceCumSumLayerTest : public testing::TestWithParam<CumSumParams>, pu
return std::make_shared<ov::Model>(NodeVector{cum_sum}, ParameterVector{data_param, axis_param});
}

static std::shared_ptr<Model> CreateFunction(const PartialShape& data_shape, const element::Type& data_type) {
static std::shared_ptr<Model> CreateFunction(const Shape& data_shape, const element::Type& data_type) {
const auto data_param = std::make_shared<op::v0::Parameter>(data_type, data_shape);
const auto cum_sum = std::make_shared<op::v0::CumSum>(data_param);
return std::make_shared<ov::Model>(NodeVector{cum_sum}, ParameterVector{data_param});
Expand All @@ -130,162 +130,162 @@ std::vector<CumSumParams> generateCumSumParams(const element::Type& type) {
using T = typename element_type_traits<IN_ET>::value_type;
std::vector<CumSumParams> opParams{
// Default axis input and attributes
CumSumParams(PartialShape{1}, type, std::vector<T>{3}, std::vector<T>{3}),
CumSumParams(PartialShape{6}, type, std::vector<T>{1, 2, 3, 4, 5, 6}, std::vector<T>{1, 3, 6, 10, 15, 21}),
CumSumParams(PartialShape{2, 4},
CumSumParams(Shape{1}, type, std::vector<T>{3}, std::vector<T>{3}),
CumSumParams(Shape{6}, type, std::vector<T>{1, 2, 3, 4, 5, 6}, std::vector<T>{1, 3, 6, 10, 15, 21}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{0, 1, 2, 3, 4, 6, 8, 10}),
// Custom axis input and attributes
CumSumParams(PartialShape{6},
CumSumParams(Shape{6},
type,
std::vector<T>{1, 2, 3, 4, 5, 6},
std::vector<T>{1, 3, 6, 10, 15, 21},
false,
false,
element::i32,
int32_t(0),
PartialShape{}), // axis i32
CumSumParams(PartialShape{6},
Shape{}), // axis i32
CumSumParams(Shape{6},
type,
std::vector<T>{1, 2, 3, 4, 5, 6},
std::vector<T>{1, 3, 6, 10, 15, 21},
false,
false,
element::i64,
int64_t(0),
PartialShape{}), // axis i64
CumSumParams(PartialShape{6},
Shape{}), // axis i64
CumSumParams(Shape{6},
type,
std::vector<T>{1, 2, 3, 4, 5, 6},
std::vector<T>{21, 20, 18, 15, 11, 6},
false,
true,
element::i64,
int64_t(0),
PartialShape{}),
CumSumParams(PartialShape{6},
Shape{}),
CumSumParams(Shape{6},
type,
std::vector<T>{1, 2, 3, 4, 5, 6},
std::vector<T>{0, 1, 3, 6, 10, 15},
true,
false,
element::i64,
int64_t(0),
PartialShape{}),
CumSumParams(PartialShape{6},
Shape{}),
CumSumParams(Shape{6},
type,
std::vector<T>{1, 2, 3, 4, 5, 6},
std::vector<T>{20, 18, 15, 11, 6, 0},
true,
true,
element::i64,
int64_t(0),
PartialShape{}),
Shape{}),

CumSumParams(PartialShape{2, 4},
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{0, 1, 2, 3, 4, 6, 8, 10},
false,
false,
element::i32,
int32_t(0),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{4, 6, 8, 10, 4, 5, 6, 7},
false,
true,
element::i32,
int32_t(0),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{0, 0, 0, 0, 0, 1, 2, 3},
true,
false,
element::i32,
int32_t(0),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{4, 5, 6, 7, 0, 0, 0, 0},
true,
true,
element::i32,
int32_t(0),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{0, 1, 3, 6, 4, 9, 15, 22},
false,
false,
element::i32,
int32_t(1),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{0, 0, 1, 3, 0, 4, 9, 15},
true,
false,
element::i32,
int32_t(1),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{6, 6, 5, 3, 22, 18, 13, 7},
false,
true,
element::i32,
int32_t(1),
PartialShape{}),
CumSumParams(PartialShape{2, 4},
Shape{}),
CumSumParams(Shape{2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7},
std::vector<T>{6, 5, 3, 0, 18, 13, 7, 0},
true,
true,
element::i32,
int32_t(1),
PartialShape{}),
Shape{}),

CumSumParams(
PartialShape{3, 2, 4},
Shape{3, 2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 18, 20, 22, 24, 27, 30, 33, 36, 39, 42, 45},
false,
false,
element::i32,
int32_t(0),
PartialShape{}),
Shape{}),
CumSumParams(
PartialShape{3, 2, 4},
Shape{3, 2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
std::vector<T>{0, 1, 2, 3, 4, 6, 8, 10, 8, 9, 10, 11, 20, 22, 24, 26, 16, 17, 18, 19, 36, 38, 40, 42},
false,
false,
element::i32,
int32_t(1),
PartialShape{}),
Shape{}),
CumSumParams(
PartialShape{3, 2, 4},
Shape{3, 2, 4},
type,
std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
std::vector<T>{0, 1, 3, 6, 4, 9, 15, 22, 8, 17, 27, 38, 12, 25, 39, 54, 16, 33, 51, 70, 20, 41, 63, 86},
false,
false,
element::i32,
int32_t(2),
PartialShape{}),
Shape{}),
};
return opParams;
}
Expand Down

0 comments on commit 4789cae

Please sign in to comment.