[GPU] Mvn skipconfig update and typos fix (#17660)

This commit is contained in:
Pavel Durandin 2023-05-29 09:09:36 +04:00 committed by GitHub
parent 57e23ffc0a
commit dfb6c8ae38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 77 deletions

View File

@ -54,7 +54,7 @@ public:
} }
result << "Precision=" << netPrecision << "_"; result << "Precision=" << netPrecision << "_";
if (!axes.empty()) { if (!axes.empty()) {
result << "ReductionAccess=" << CommonTestUtils::vec2str(axes.to_vector()) << "_"; result << "ReductionAxes=" << CommonTestUtils::vec2str(axes.to_vector()) << "_";
} else { } else {
result << "AcrossChannels=" << (acrossChanels ? "TRUE" : "FALSE") << "_"; result << "AcrossChannels=" << (acrossChanels ? "TRUE" : "FALSE") << "_";
} }

View File

@ -103,8 +103,6 @@ std::vector<std::string> disabledTestPatterns() {
R"(.*CoreThreadingTests.*smoke.*Network.*)", R"(.*CoreThreadingTests.*smoke.*Network.*)",
// Assign-3/ReadValue-3 does not have evaluate() methods; ref implementation does not save the value across the inferences. // Assign-3/ReadValue-3 does not have evaluate() methods; ref implementation does not save the value across the inferences.
R"(smoke_MemoryTestV3.*)", R"(smoke_MemoryTestV3.*)",
// Unsupported 8d tensors
R"(smoke_Basic/SqueezeUnsqueezeLayerTest.CompareWithRefs/OpType=Unsqueeze_IS=\(1.1.1.1\)_Axes=\((0.1.2|0.2.3|1.2.3|0.1.2.3|)\)_.*)",
// Issue: 90539 // Issue: 90539
R"(smoke_AutoBatch_BehaviorTests/OVInferRequestIOTensorTest.InferStaticNetworkSetInputTensor/targetDevice=BATCH.*)", R"(smoke_AutoBatch_BehaviorTests/OVInferRequestIOTensorTest.InferStaticNetworkSetInputTensor/targetDevice=BATCH.*)",
// TODO: range input with one element should NOT be regarded as dynamic batch model in Program::IsDynBatchModel(). // TODO: range input with one element should NOT be regarded as dynamic batch model in Program::IsDynBatchModel().

View File

@ -44,7 +44,7 @@ public:
result << "(" << CommonTestUtils::vec2str(shape) << ")_"; result << "(" << CommonTestUtils::vec2str(shape) << ")_";
} }
result << "Precision=" << netPrecision << "_"; result << "Precision=" << netPrecision << "_";
result << "ReductionAccess=" << CommonTestUtils::vec2str(axes) << "_"; result << "ReductionAxes=" << CommonTestUtils::vec2str(axes) << "_";
result << "NormalizeVariance=" << (normalizeVariance ? "TRUE" : "FALSE") << "_"; result << "NormalizeVariance=" << (normalizeVariance ? "TRUE" : "FALSE") << "_";
result << "Epsilon=" << eps; result << "Epsilon=" << eps;
result << "_" << "CNNInpPrc=" << inputPrecision; result << "_" << "CNNInpPrc=" << inputPrecision;
@ -94,17 +94,6 @@ TEST_P(MvnLayerGPUTest, CompareWithRefs) {
namespace { namespace {
const std::vector<InputShape> inputShapes_1D = { const std::vector<InputShape> inputShapes_1D = {
{
// dynamic
{-1},
// target
{
{2},
{16},
{1},
{2}
}
},
{ {
// dynamic // dynamic
{{1, 20}}, {{1, 20}},
@ -118,31 +107,6 @@ const std::vector<InputShape> inputShapes_1D = {
} }
}; };
const std::vector<InputShape> inputShapes_2D = {
{
// dynamic
{-1, -1},
// target
{
{2, 16},
{4, 16},
{1, 16},
{4, 16}
}
},
{
// dynamic
{{1, 5}, {1, 20}},
// target
{
{1, 1},
{2, 16},
{4, 16},
{2, 16}
}
}
};
const std::vector<InputShape> inputShapes_3D = { const std::vector<InputShape> inputShapes_3D = {
{ {
// dynamic // dynamic
@ -235,7 +199,6 @@ const std::vector<int> reduction_axes_23 = {2, 3};
const std::vector<int> reduction_axes_12 = {1, 2}; const std::vector<int> reduction_axes_12 = {1, 2};
const std::vector<int> reduction_axes_3 = {3}; const std::vector<int> reduction_axes_3 = {3};
const std::vector<int> reduction_axes_2 = {2}; const std::vector<int> reduction_axes_2 = {2};
const std::vector<int> empty_reduction_axes = {};
std::vector<ElementType> inpPrc = {ElementType::i8, ElementType::f16, ElementType::f32}; std::vector<ElementType> inpPrc = {ElementType::i8, ElementType::f16, ElementType::f32};
@ -272,40 +235,5 @@ const auto Mvn5D = ::testing::Combine(
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn5D, MvnLayerGPUTest, Mvn5D, MvnLayerGPUTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn5D, MvnLayerGPUTest, Mvn5D, MvnLayerGPUTest::getTestCaseName);
const auto Mvn1D = ::testing::Combine(
::testing::Combine(
::testing::ValuesIn(inputShapes_1D),
::testing::Values(ElementType::f32),
::testing::ValuesIn({empty_reduction_axes}),
::testing::ValuesIn(normalizeVariance),
::testing::ValuesIn(epsilon)),
::testing::ValuesIn(inpPrc));
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn1D, MvnLayerGPUTest, Mvn1D, MvnLayerGPUTest::getTestCaseName);
// 2D no transformed
const auto Mvn2D = ::testing::Combine(
::testing::Combine(
::testing::ValuesIn(inputShapes_2D),
::testing::Values(ElementType::f32),
::testing::ValuesIn({empty_reduction_axes}),
::testing::ValuesIn(normalizeVariance),
::testing::ValuesIn(epsilon)),
::testing::ValuesIn(inpPrc));
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn2D, MvnLayerGPUTest, Mvn2D, MvnLayerGPUTest::getTestCaseName);
// 2d transformed
const auto Mvn2DTrans = ::testing::Combine(
::testing::Combine(
::testing::ValuesIn(inputShapes_2D),
::testing::Values(ElementType::f32),
::testing::ValuesIn({empty_reduction_axes}),
::testing::ValuesIn(normalizeVariance),
::testing::ValuesIn(epsilon)),
::testing::ValuesIn(inpPrc));
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn2DTrans, MvnLayerGPUTest, Mvn2DTrans, MvnLayerGPUTest::getTestCaseName);
} // namespace } // namespace
} // namespace GPULayerTestsDefinitions } // namespace GPULayerTestsDefinitions

View File

@ -19,7 +19,7 @@ std::string Mvn1LayerTest::getTestCaseName(const testing::TestParamInfo<mvn1Para
result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_";
result << "Precision=" << inputPrecision.name() << "_"; result << "Precision=" << inputPrecision.name() << "_";
if (!axes.empty()) { if (!axes.empty()) {
result << "ReductionAccess=" << CommonTestUtils::vec2str(axes.to_vector()) << "_"; result << "ReductionAxes=" << CommonTestUtils::vec2str(axes.to_vector()) << "_";
} else { } else {
result << "AcrossChannels=" << (acrossChannels ? "TRUE" : "FALSE") << "_"; result << "AcrossChannels=" << (acrossChannels ? "TRUE" : "FALSE") << "_";
} }