IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate Movement 1 Operations (VariadicSplit-1) (#8091)

Browse Source 
* Migrate VariadicSplit

* Skip dynamic shape tests

* Add shapes to tensors
This commit is contained in:
Steve Yoo
2021-11-01 11:42:10 +09:00
committed by GitHub
parent d50a40cd09
commit 05dfee0a70
3 changed files with 297 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

297
docs/template_plugin/tests/functional/op_reference/variadic_split.cpp Normal file
View File

@@ -0,0 +1,297 @@
// Copyright (C) 2021 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#include <gtest/gtest.h>
#include "openvino/op/variadic_split.hpp"
#include "openvino/op/constant.hpp"
#include "base_reference_test.hpp"
using namespace reference_tests;
using namespace ov;
namespace {
struct VariadicSplitParams {
VariadicSplitParams(const ov::PartialShape& dynamicDataShape, const Tensor& dataTensor,
const Tensor& axisTensor, const Tensor& splitLengthTensor,
const std::vector<Tensor>& expectedTensors, const std::string& testcaseName = "") :
dynamicDataShape(dynamicDataShape), dataTensor(dataTensor),
axisTensor(axisTensor), splitLengthTensor(splitLengthTensor),
expectedTensors(expectedTensors), testcaseName(testcaseName) {}
ov::PartialShape dynamicDataShape;
Tensor dataTensor;
Tensor axisTensor;
Tensor splitLengthTensor;
std::vector<Tensor> expectedTensors;
std::string testcaseName;
};
class ReferenceVariadicSplitTest : public testing::TestWithParam<VariadicSplitParams>, public CommonReferenceTest {
public:
void SetUp() override {
auto params = GetParam();
if (params.dynamicDataShape.is_static()) {
inputData = {params.dataTensor.data};
function = CreateFunction(params);
} else {
inputData = {params.dataTensor.data, params.axisTensor.data, params.splitLengthTensor.data};
function = CreateDynamicFunction(params);
}
for (const auto& expectedTensor : params.expectedTensors) {
refOutData.push_back(expectedTensor.data);
}
}
static std::string getTestCaseName(const testing::TestParamInfo<VariadicSplitParams>& obj) {
auto param = obj.param;
std::ostringstream result;
result << "ddShape=" << param.dynamicDataShape;
result << "_dType=" << param.dataTensor.type;
result << "_dShape=" << param.dataTensor.shape;
result << "_aType=" << param.axisTensor.type;
result << "_aShape=" << param.axisTensor.shape;
result << "_sType=" << param.splitLengthTensor.type;
result << "_sShape=" << param.splitLengthTensor.shape;
result << "_eType=" << param.expectedTensors[0].type;
if (param.testcaseName != "") {
result << "_eShape=" << param.expectedTensors[0].shape;
result << "_" << param.testcaseName;
} else {
result << "_eShape=" << param.expectedTensors[0].shape;
}
return result.str();
}
private:
static std::shared_ptr<Function> CreateFunction(const VariadicSplitParams& params) {
const auto data = std::make_shared<op::v0::Parameter>(params.dataTensor.type, params.dataTensor.shape);
const auto axis = std::make_shared<op::v0::Constant>(params.axisTensor.type,
params.axisTensor.shape,
params.axisTensor.data.data());
const auto splitLengths = std::make_shared<op::v0::Constant>(params.splitLengthTensor.type,
params.splitLengthTensor.shape,
params.splitLengthTensor.data.data());
const auto split = std::make_shared<op::v1::VariadicSplit>(data, axis, splitLengths);
return std::make_shared<ov::Function>(split->outputs(), ParameterVector{data});
}
static std::shared_ptr<Function> CreateDynamicFunction(const VariadicSplitParams& params) {
const auto data = std::make_shared<op::v0::Parameter>(params.dataTensor.type, params.dynamicDataShape);
const auto axis = std::make_shared<op::v0::Parameter>(params.axisTensor.type, params.axisTensor.shape);
const auto splitLengths = std::make_shared<op::v0::Parameter>(params.splitLengthTensor.type, params.splitLengthTensor.shape);
const auto split = std::make_shared<op::v1::VariadicSplit>(data, axis, splitLengths);
return std::make_shared<ov::Function>(split->outputs(), ParameterVector{data, axis, splitLengths});
}
};
TEST_P(ReferenceVariadicSplitTest, CompareWithRefs) {
Exec();
}
template <element::Type_t IN_ET>
std::vector<VariadicSplitParams> generateVariadicSplitParams() {
using T = typename element_type_traits<IN_ET>::value_type;
std::vector<VariadicSplitParams> variadicSplitParams {
// variadic_split_1d_static
VariadicSplitParams({10},
Tensor(IN_ET, {10}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}),
Tensor(element::i32, {1}, std::vector<int32_t>{0}),
Tensor(element::i32, {3}, std::vector<int32_t>{5, 3, 2}),
std::vector<Tensor>{Tensor(IN_ET, {5}, std::vector<T>{1, 2, 3, 4, 5}),
Tensor(IN_ET, {3}, std::vector<T>{6, 7, 8}),
Tensor(IN_ET, {2}, std::vector<T>{9, 10})},
"variadic_split_1d_static"),
// variadic_split_1d_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {10}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}),
Tensor(element::i32, {1}, std::vector<int32_t>{0}),
Tensor(element::i32, {3}, std::vector<int32_t>{5, 3, 2}),
std::vector<Tensor>{Tensor(IN_ET, {5}, std::vector<T>{1, 2, 3, 4, 5}),
Tensor(IN_ET, {3}, std::vector<T>{6, 7, 8}),
Tensor(IN_ET, {2}, std::vector<T>{9, 10})},
"variadic_split_1d_dynamic"),
// variadic_split_2d_axis_0_static
VariadicSplitParams({6, 2},
Tensor(IN_ET, {6, 2}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}),
Tensor(element::i32, {}, std::vector<int32_t>{0}),
Tensor(element::i32, {2}, std::vector<int32_t>{4, 2}),
std::vector<Tensor>{Tensor(IN_ET, {4, 2}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8}),
Tensor(IN_ET, {2, 2}, std::vector<T>{9, 10, 11, 12})},
"variadic_split_2d_axis_0_static"),
// variadic_split_2d_axis_0_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {6, 2}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}),
Tensor(element::i32, {}, std::vector<int32_t>{0}),
Tensor(element::i32, {2}, std::vector<int32_t>{4, 2}),
std::vector<Tensor>{Tensor(IN_ET, {4, 2}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8}),
Tensor(IN_ET, {2, 2}, std::vector<T>{9, 10, 11, 12})},
"variadic_split_2d_axis_0_dynamic"),
// variadic_split_2d_axis_1_static
VariadicSplitParams({4, 3},
Tensor(IN_ET, {4, 3}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}),
Tensor(element::i32, {}, std::vector<int32_t>{1}),
Tensor(element::i32, {2}, std::vector<int32_t>{1, 2}),
std::vector<Tensor>{Tensor(IN_ET, {4, 1}, std::vector<T>{1, 4, 7, 10}),
Tensor(IN_ET, {4, 2}, std::vector<T>{2, 3, 5, 6, 8, 9, 11, 12})},
"variadic_split_2d_axis_1_static"),
// variadic_split_2d_axis_1_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {4, 3}, std::vector<T>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}),
Tensor(element::i32, {}, std::vector<int32_t>{1}),
Tensor(element::i32, {2}, std::vector<int32_t>{1, 2}),
std::vector<Tensor>{Tensor(IN_ET, {4, 1}, std::vector<T>{1, 4, 7, 10}),
Tensor(IN_ET, {4, 2}, std::vector<T>{2, 3, 5, 6, 8, 9, 11, 12})},
"variadic_split_2d_axis_1_dynamic"),
// variadic_split_4d_axis_0_static
VariadicSplitParams({6, 2, 3, 1},
Tensor(IN_ET, {6, 2, 3, 1}, 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,
24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35}),
Tensor(element::i32, {1}, std::vector<int32_t>{0}),
Tensor(element::i32, {3}, std::vector<int32_t>{3, 1, 2}),
std::vector<Tensor>{Tensor(IN_ET, {3, 2, 3, 1}, std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
16, 17}),
Tensor(IN_ET, {1, 2, 3, 1}, std::vector<T>{18, 19, 20, 21, 22, 23}),
Tensor(IN_ET, {2, 2, 3, 1}, std::vector<T>{24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35})},
"variadic_split_4d_axis_0_static"),
// variadic_split_4d_axis_0_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {6, 2, 3, 1}, 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,
24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35}),
Tensor(element::i32, {1}, std::vector<int32_t>{0}),
Tensor(element::i32, {3}, std::vector<int32_t>{3, 1, 2}),
std::vector<Tensor>{Tensor(IN_ET, {3, 2, 3, 1}, std::vector<T>{0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
16, 17}),
Tensor(IN_ET, {1, 2, 3, 1}, std::vector<T>{18, 19, 20, 21, 22, 23}),
Tensor(IN_ET, {2, 2, 3, 1}, std::vector<T>{24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35})},
"variadic_split_4d_axis_0_dynamic"),
// variadic_split_4d_axis_1_static
VariadicSplitParams({2, 8, 2, 2},
Tensor(IN_ET, {2, 8, 2, 2}, 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,
24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63}),
Tensor(element::i32, {1}, std::vector<int32_t>{1}),
Tensor(element::i32, {4}, std::vector<int32_t>{1, 3, 2, 2}),
std::vector<Tensor>{Tensor(IN_ET, {2, 1, 2, 2}, std::vector<T>{0, 1, 2, 3, 32, 33, 34, 35}),
Tensor(IN_ET, {2, 3, 2, 2}, std::vector<T>{4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47}),
Tensor(IN_ET, {2, 2, 2, 2}, std::vector<T>{16, 17, 18, 19, 20, 21, 22, 23,
48, 49, 50, 51, 52, 53, 54, 55}),
Tensor(IN_ET, {2, 2, 2, 2}, std::vector<T>{24, 25, 26, 27, 28, 29, 30, 31,
56, 57, 58, 59, 60, 61, 62, 63})},
"variadic_split_4d_axis_1_static"),
// variadic_split_4d_axis_1_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {2, 8, 2, 2}, 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,
24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63}),
Tensor(element::i32, {1}, std::vector<int32_t>{1}),
Tensor(element::i32, {4}, std::vector<int32_t>{1, 3, 2, 2}),
std::vector<Tensor>{Tensor(IN_ET, {2, 1, 2, 2}, std::vector<T>{0, 1, 2, 3, 32, 33, 34, 35}),
Tensor(IN_ET, {2, 3, 2, 2}, std::vector<T>{4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47}),
Tensor(IN_ET, {2, 2, 2, 2}, std::vector<T>{16, 17, 18, 19, 20, 21, 22, 23,
48, 49, 50, 51, 52, 53, 54, 55}),
Tensor(IN_ET, {2, 2, 2, 2}, std::vector<T>{24, 25, 26, 27, 28, 29, 30, 31,
56, 57, 58, 59, 60, 61, 62, 63})},
"variadic_split_4d_axis_1_dynamic"),
// variadic_split_4d_axis_2_static
VariadicSplitParams({2, 1, 6, 2},
Tensor(IN_ET, {2, 1, 6, 2}, 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}),
Tensor(element::i32, {1}, std::vector<int32_t>{2}),
Tensor(element::i32, {3}, std::vector<int32_t>{3, 1, 2}),
std::vector<Tensor>{Tensor(IN_ET, {2, 1, 3, 2}, std::vector<T>{0, 1, 2, 3, 4, 5, 12, 13,
14, 15, 16, 17}),
Tensor(IN_ET, {2, 1, 1, 2}, std::vector<T>{6, 7, 18, 19}),
Tensor(IN_ET, {2, 1, 2, 2}, std::vector<T>{8, 9, 10, 11, 20, 21, 22, 23})},
"variadic_split_4d_axis_2_static"),
// variadic_split_4d_axis_2_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {2, 1, 6, 2}, 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}),
Tensor(element::i32, {1}, std::vector<int32_t>{2}),
Tensor(element::i32, {3}, std::vector<int32_t>{-1, 1, 2}),
std::vector<Tensor>{Tensor(IN_ET, {2, 1, 3, 2}, std::vector<T>{0, 1, 2, 3, 4, 5, 12, 13,
14, 15, 16, 17}),
Tensor(IN_ET, {2, 1, 1, 2}, std::vector<T>{6, 7, 18, 19}),
Tensor(IN_ET, {2, 1, 2, 2}, std::vector<T>{8, 9, 10, 11, 20, 21, 22, 23})},
"variadic_split_4d_axis_2_dynamic"),
// variadic_split_4d_axis_3_static
VariadicSplitParams({2, 1, 2, 6},
Tensor(IN_ET, {2, 1, 2, 6}, 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}),
Tensor(element::i32, {1}, std::vector<int32_t>{3}),
Tensor(element::i32, {3}, std::vector<int32_t>{1, -1, 3}),
std::vector<Tensor>{Tensor(IN_ET, {2, 1, 2, 1}, std::vector<T>{0, 6, 12, 18}),
Tensor(IN_ET, {2, 1, 2, 2}, std::vector<T>{1, 2, 7, 8, 13, 14, 19, 20}),
Tensor(IN_ET, {2, 1, 2, 3}, std::vector<T>{3, 4, 5, 9, 10, 11, 15, 16,
17, 21, 22, 23})},
"variadic_split_4d_axis_3_static"),
// variadic_split_4d_axis_3_dynamic
VariadicSplitParams(PartialShape::dynamic(),
Tensor(IN_ET, {2, 1, 2, 6}, 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}),
Tensor(element::i32, {1}, std::vector<int32_t>{3}),
Tensor(element::i32, {3}, std::vector<int32_t>{1, 2, -1}),
std::vector<Tensor>{Tensor(IN_ET, {2, 1, 2, 1}, std::vector<T>{0, 6, 12, 18}),
Tensor(IN_ET, {2, 1, 2, 2}, std::vector<T>{1, 2, 7, 8, 13, 14, 19, 20}),
Tensor(IN_ET, {2, 1, 2, 3}, std::vector<T>{3, 4, 5, 9, 10, 11, 15, 16,
17, 21, 22, 23})},
"variadic_split_4d_axis_3_dynamic"),
};
return variadicSplitParams;
}
std::vector<VariadicSplitParams> generateVariadicSplitCombinedParams() {
const std::vector<std::vector<VariadicSplitParams>> variadicSplitTypeParams {
generateVariadicSplitParams<element::Type_t::i8>(),
generateVariadicSplitParams<element::Type_t::i16>(),
generateVariadicSplitParams<element::Type_t::i32>(),
generateVariadicSplitParams<element::Type_t::i64>(),
generateVariadicSplitParams<element::Type_t::u8>(),
generateVariadicSplitParams<element::Type_t::u16>(),
generateVariadicSplitParams<element::Type_t::u32>(),
generateVariadicSplitParams<element::Type_t::u64>(),
generateVariadicSplitParams<element::Type_t::f16>(),
generateVariadicSplitParams<element::Type_t::f32>(),
};
std::vector<VariadicSplitParams> combinedParams;
for (const auto& params : variadicSplitTypeParams) {
combinedParams.insert(combinedParams.end(), params.begin(), params.end());
}
return combinedParams;
}
INSTANTIATE_TEST_SUITE_P(smoke_VariadicSplit_With_Hardcoded_Refs, ReferenceVariadicSplitTest,
testing::ValuesIn(generateVariadicSplitCombinedParams()), ReferenceVariadicSplitTest::getTestCaseName);
} // namespace