Skip to content

Commit

Permalink
[CPU tests] migrate single layer test cases to be API 2.0 - part 5 (o…
Browse files Browse the repository at this point in the history 
…penvinotoolkit#21489)

Signed-off-by: Zhai, Xuejun <xuejun.zhai@intel.com>
  • Loading branch information
@zhaixuejun1993
zhaixuejun1993 authored Dec 6, 2023
1 parent 6391b0c commit 275e14d
Show file tree
Hide file tree
Showing 14 changed files with 2,807 additions and 3,167 deletions.
188 changes: 77 additions & 111 deletions src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,55 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <common_test_utils/ov_tensor_utils.hpp>
#include "common_test_utils/ov_tensor_utils.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "test_utils/fusing_test_utils.hpp"
#include "ov_models/builders.hpp"

using namespace InferenceEngine;
using namespace CPUTestUtils;
using namespace ov::test;
namespace ov {
namespace test {

namespace CPULayerTestsDefinitions {

using selectParams = std::tuple<std::vector<InputShape>, // input shapes
ElementType, // Then/Else precision
ngraph::op::AutoBroadcastSpec, // broadcast
using selectParams = std::tuple<std::vector<InputShape>, // input shapes
ElementType, // Then/Else precision
ov::op::AutoBroadcastSpec, // broadcast
fusingSpecificParams>;

class SelectLayerCPUTest : public testing::WithParamInterface<selectParams>,
virtual public SubgraphBaseTest,
public CpuTestWithFusing {
public:
static std::string getTestCaseName(testing::TestParamInfo<selectParams> obj) {
std::vector<InputShape> shapes;
ElementType precision;
ngraph::op::AutoBroadcastSpec broadcast;
fusingSpecificParams fusingParams;
std::tie(shapes, precision, broadcast, fusingParams) = obj.param;

std::ostringstream result;
result << "Condition_prc_" << ElementType::boolean << "_Then_Else_prc_" << precision << "_";
result << "IS=(";
for (const auto& shape : shapes) {
result << shape.first << "_";
}
result << ")_TS=(";
for (const auto& shape : shapes) {
for (const auto& item : shape.second) {
result << ov::test::utils::vec2str(item) << "_";
}
}
result << "Broadcast=" << broadcast.m_type;
result << CpuTestWithFusing::getTestCaseName(fusingParams);

return result.str();
}
static std::string getTestCaseName(testing::TestParamInfo<selectParams> obj) {
std::vector<InputShape> shapes;
ElementType precision;
ov::op::AutoBroadcastSpec broadcast;
fusingSpecificParams fusingParams;
std::tie(shapes, precision, broadcast, fusingParams) = obj.param;

std::ostringstream result;
result << "Condition_prc_" << ElementType::boolean << "_Then_Else_prc_" << precision << "_";
result << "IS=(";
for (const auto& shape : shapes) {
result << shape.first << "_";
}
result << ")_TS=(";
for (const auto& shape : shapes) {
for (const auto& item : shape.second) {
result << ov::test::utils::vec2str(item) << "_";
}
}
result << "Broadcast=" << broadcast.m_type;
result << CpuTestWithFusing::getTestCaseName(fusingParams);

return result.str();
}

protected:
void SetUp() override {
void SetUp() override {
abs_threshold = 0;
targetDevice = ov::test::utils::DEVICE_CPU;
std::vector<InputShape> shapes;
ElementType precision;
ngraph::op::AutoBroadcastSpec broadcast;
ov::op::AutoBroadcastSpec broadcast;
fusingSpecificParams fusingParams;
std::tie(shapes, precision, broadcast, fusingParams) = this->GetParam();
init_input_shapes(shapes);
Expand All @@ -69,14 +66,26 @@ class SelectLayerCPUTest : public testing::WithParamInterface<selectParams>,
auto select = std::make_shared<ov::op::v1::Select>(parameters[0], parameters[1], parameters[2], broadcast);

function = makeNgraphFunction(precision, parameters, select, "Eltwise");
}
}

void generate_inputs(const std::vector<ov::Shape>& targetInputStaticShapes) override {
void generate_inputs(const std::vector<ov::Shape>& targetInputStaticShapes) override {
inputs.clear();
const auto& modelInputs = function->inputs();
auto condTensor = ov::test::utils::create_and_fill_tensor(modelInputs[0].get_element_type(), targetInputStaticShapes[0], 3, -1, 2);
auto thenTensor = ov::test::utils::create_and_fill_tensor(modelInputs[1].get_element_type(), targetInputStaticShapes[1], 10, -10, 2);
auto elseTensor = ov::test::utils::create_and_fill_tensor(modelInputs[2].get_element_type(), targetInputStaticShapes[2], 10, 0, 2);
auto condTensor = ov::test::utils::create_and_fill_tensor(modelInputs[0].get_element_type(),
targetInputStaticShapes[0],
3,
-1,
2);
auto thenTensor = ov::test::utils::create_and_fill_tensor(modelInputs[1].get_element_type(),
targetInputStaticShapes[1],
10,
-10,
2);
auto elseTensor = ov::test::utils::create_and_fill_tensor(modelInputs[2].get_element_type(),
targetInputStaticShapes[2],
10,
0,
2);
inputs.insert({modelInputs[0].get_node_shared_ptr(), condTensor});
inputs.insert({modelInputs[1].get_node_shared_ptr(), thenTensor});
inputs.insert({modelInputs[2].get_node_shared_ptr(), elseTensor});
Expand All @@ -88,12 +97,7 @@ TEST_P(SelectLayerCPUTest, CompareWithRefs) {
CheckPluginRelatedResults(compiledModel, std::set<std::string>{"Eltwise", "Subgraph"});
}

const std::vector<ElementType> precisions = {
ElementType::f32,
ElementType::i32,
ElementType::bf16,
ElementType::i8
};
const std::vector<ElementType> precisions = {ElementType::f32, ElementType::i32, ElementType::bf16, ElementType::i8};

const std::vector<fusingSpecificParams> fusingParamsSet{
emptyFusingSpec,
Expand All @@ -104,106 +108,68 @@ const std::vector<fusingSpecificParams> fusingParamsSet{
const std::vector<std::vector<InputShape>> inShapesDynamicNumpy = {
{
// Condition
{
{-1, -1, -1, -1},
{{5, 1, 2, 1}, {1, 1, 1, 1}, {5, 9, 8, 7}}
},
{{-1, -1, -1, -1}, {{5, 1, 2, 1}, {1, 1, 1, 1}, {5, 9, 8, 7}}},
// Then
{
{-1, -1, -1, -1, -1},
{{8, 1, 9, 1, 1}, {1, 1, 1, 1, 1}, {21, 5, 9, 8, 7}}
},
{{-1, -1, -1, -1, -1}, {{8, 1, 9, 1, 1}, {1, 1, 1, 1, 1}, {21, 5, 9, 8, 7}}},
// Else
{
{-1, -1, -1, -1},
{{5, 1, 2, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}}
},
{{-1, -1, -1, -1}, {{5, 1, 2, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}}},
},
{
// Condition
{
{-1, -1},
{{8, 1}, {10, 5}, {8, 7}}
},
{{-1, -1}, {{8, 1}, {10, 5}, {8, 7}}},
// Then
{
{-1, -1, -1, -1, -1},
{{2, 1, 1, 8, 1}, {7, 8, 3, 10, 5}, {1, 1, 1, 8, 1}}
},
{{-1, -1, -1, -1, -1}, {{2, 1, 1, 8, 1}, {7, 8, 3, 10, 5}, {1, 1, 1, 8, 1}}},
// Else
{
{-1, -1, -1},
{{9, 1, 1}, {3, 10, 5}, {1, 1, 7}}
},
{{-1, -1, -1}, {{9, 1, 1}, {3, 10, 5}, {1, 1, 7}}},
},
{
// Condition
{
{{2, 8}, {3, 7}, {1, 10}, {1, 6}, {1, 10}},
{{5, 4, 1, 1, 1}, {8, 5, 5, 5, 1}, {2, 3, 4, 5, 6}}
},
{{{2, 8}, {3, 7}, {1, 10}, {1, 6}, {1, 10}}, {{5, 4, 1, 1, 1}, {8, 5, 5, 5, 1}, {2, 3, 4, 5, 6}}},
// Then
{
{-1, -1, -1, -1, -1},
{{5, 1, 8, 1, 1}, {8, 1, 1, 1, 8}, {2, 3, 4, 5, 6}}
},
{{-1, -1, -1, -1, -1}, {{5, 1, 8, 1, 1}, {8, 1, 1, 1, 8}, {2, 3, 4, 5, 6}}},
// Else
{
{{1, 5}, {1, 11}, {5, 5}, {1, 8}},
{{1, 1, 5, 1}, {5, 5, 5, 8}, {3, 4, 5, 6}}
},
{{{1, 5}, {1, 11}, {5, 5}, {1, 8}}, {{1, 1, 5, 1}, {5, 5, 5, 8}, {3, 4, 5, 6}}},
},
{
// Condition
{
{{1, 10}},
{{4}, {10}, {1}}
},
{{{1, 10}}, {{4}, {10}, {1}}},
// Then
{
{{1, 15}, {2, 7}, {1, 6}, {5, 12}, {1, 20}},
{{8, 5, 6, 6, 1}, {15, 7, 6, 10, 10}, {2, 5, 4, 5, 3}}
},
{{{1, 15}, {2, 7}, {1, 6}, {5, 12}, {1, 20}}, {{8, 5, 6, 6, 1}, {15, 7, 6, 10, 10}, {2, 5, 4, 5, 3}}},
// Else
{
{{2, 10}, {1, 16}},
{{6, 4}, {10, 10}, {5, 1}}
},
{{{2, 10}, {1, 16}}, {{6, 4}, {10, 10}, {5, 1}}},
},
};

const auto numpyCases = ::testing::Combine(::testing::ValuesIn(inShapesDynamicNumpy),
::testing::ValuesIn(precisions),
::testing::Values(ngraph::op::AutoBroadcastType::NUMPY),
::testing::Values(ov::op::AutoBroadcastType::NUMPY),
::testing::ValuesIn(fusingParamsSet));

INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNumpy_dynamic, SelectLayerCPUTest, numpyCases, SelectLayerCPUTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNumpy_dynamic,
SelectLayerCPUTest,
numpyCases,
SelectLayerCPUTest::getTestCaseName);

const std::vector<std::vector<InputShape>> inShapesDynamicNone = {
{
// Condition
{
{{1, 10}, -1, {10, 20}, {1, 5}},
{{3, 16, 15, 5}, {1, 16, 10, 1}, {10, 16, 20, 5}}
},
{{{1, 10}, -1, {10, 20}, {1, 5}}, {{3, 16, 15, 5}, {1, 16, 10, 1}, {10, 16, 20, 5}}},
// Then
{
{-1, {16, 16}, -1, -1},
{{3, 16, 15, 5}, {1, 16, 10, 1}, {10, 16, 20, 5}}
},
{{-1, {16, 16}, -1, -1}, {{3, 16, 15, 5}, {1, 16, 10, 1}, {10, 16, 20, 5}}},
// Else
{
{-1, -1, -1, -1},
{{3, 16, 15, 5}, {1, 16, 10, 1}, {10, 16, 20, 5}}
},
{{-1, -1, -1, -1}, {{3, 16, 15, 5}, {1, 16, 10, 1}, {10, 16, 20, 5}}},
},
};

const auto noneCases = ::testing::Combine(::testing::ValuesIn(inShapesDynamicNone),
::testing::ValuesIn(precisions),
::testing::Values(ngraph::op::AutoBroadcastType::NONE),
::testing::Values(ov::op::AutoBroadcastType::NONE),
::testing::ValuesIn(fusingParamsSet));

INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNone_dynamic, SelectLayerCPUTest, noneCases, SelectLayerCPUTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNone_dynamic,
SelectLayerCPUTest,
noneCases,
SelectLayerCPUTest::getTestCaseName);

} // namespace CPULayerTestsDefinitions
} // namespace test
} // namespace ov
Loading

0 comments on commit 275e14d

Please sign in to comment.