diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp index 603c96ead9edf2..82c97a51166ca6 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp @@ -75,15 +75,15 @@ const std::vector precisions = { Precision::BF16 }; -const std::vector> blockShape4D1 = {{1, 1, 1, 2}, {1, 2, 2, 1}, {1, 1, 2, 2}, {1, 2, 1, 2}}; -const std::vector> cropsBegin4D1 = {{0, 0, 0, 0}, {0, 0, 0, 1}, {0, 0, 2, 0}, {0, 0, 3, 3}}; -const std::vector> cropsEnd4D1 = {{0, 0, 0, 0}, {0, 0, 1, 0}, {0, 0, 0, 1}, {0, 0, 1, 1}}; -const std::vector> inputShapes4D1 = {{4, 32, 15, 15}, {8, 16, 10, 10}, {16, 64, 13, 16}, {16, 16, 16, 10}}; +const std::vector> blockShape4D1 = {{1, 1, 1, 2}, {1, 2, 2, 1}}; +const std::vector> cropsBegin4D1 = {{0, 0, 0, 0}, {0, 0, 0, 1}, {0, 0, 2, 0}}; +const std::vector> cropsEnd4D1 = {{0, 0, 0, 0}, {0, 0, 1, 0}, {0, 0, 1, 1}}; +const std::vector> inputShapes4D1 = {{8, 16, 10, 10}, {16, 64, 13, 16}}; -const std::vector> blockShape4D2 = {{1, 2, 3, 4}, {1, 3, 4, 2}, {1, 4, 2, 3}}; -const std::vector> cropsBegin4D2 = {{0, 0, 0, 0}, {0, 0, 0, 1}, {0, 0, 1, 2}}; -const std::vector> cropsEnd4D2 = {{0, 0, 0, 0}, {0, 0, 1, 0}, {0, 0, 3, 1}}; -const std::vector> inputShapes4D2 = {{48, 16, 7, 8}, {24, 32, 6, 6}, {24, 64, 9, 5}}; +const std::vector> blockShape4D2 = {{1, 2, 3, 4}, {1, 3, 4, 2}}; +const std::vector> cropsBegin4D2 = {{0, 0, 0, 1}, {0, 0, 1, 2}}; +const std::vector> cropsEnd4D2 = {{0, 0, 1, 0}, {0, 0, 3, 1}}; +const std::vector> inputShapes4D2 = {{48, 16, 7, 8}, {24, 32, 6, 6}}; const std::vector cpuParams_4D = { CPUSpecificParams({nChw16c}, {nChw16c}, {}, {}), @@ -126,15 +126,15 @@ INSTANTIATE_TEST_CASE_P(smoke_BatchToSpaceCPULayerTestCase1_4D, BatchToSpaceCPUL INSTANTIATE_TEST_CASE_P(smoke_BatchToSpaceCPULayerTestCase2_4D, BatchToSpaceCPULayerTest, batchToSpaceParamsSet4D2, BatchToSpaceCPULayerTest::getTestCaseName); -const std::vector> blockShape5D1 = {{1, 1, 1, 1, 2}, {1, 1, 2, 2, 1}, {1, 1, 1, 2, 2}, {1, 2, 1, 1, 2}}; -const std::vector> cropsBegin5D1 = {{0, 0, 0, 0, 0}, {0, 0, 0, 0, 1}, {0, 0, 1, 2, 0}, {0, 0, 2, 3, 3}}; -const std::vector> cropsEnd5D1 = {{0, 0, 0, 0, 0}, {0, 0, 0, 1, 0}, {0, 0, 1, 0, 1}, {0, 0, 2, 1, 1}}; -const std::vector> inputShapes5D1 = {{4, 32, 8, 10, 8}, {8, 16, 5, 10, 10}, {16, 32, 6, 12, 12}, {16, 16, 10, 8, 12}}; +const std::vector> blockShape5D1 = {{1, 1, 2, 2, 1}, {1, 2, 1, 2, 2}}; +const std::vector> cropsBegin5D1 = {{0, 0, 0, 0, 0}, {0, 0, 0, 3, 3}}; +const std::vector> cropsEnd5D1 = {{0, 0, 0, 0, 0}, {0, 0, 1, 0, 1}}; +const std::vector> inputShapes5D1 = {{8, 16, 4, 10, 10}, {16, 32, 5, 8, 12}}; -const std::vector> blockShape5D2 = {{1, 2, 4, 3, 1}, {1, 2, 1, 3, 4}, {1, 1, 2, 4, 3}}; -const std::vector> cropsBegin5D2 = {{0, 0, 0, 0, 0}, {0, 0, 1, 2, 0}, {0, 0, 1, 0, 1}}; -const std::vector> cropsEnd5D2 = {{0, 0, 0, 0, 0}, {0, 0, 1, 0, 1}, {0, 0, 1, 1, 1}}; -const std::vector> inputShapes5D2 = {{48, 16, 3, 3, 3}, {24, 32, 5, 3, 5}, {24, 16, 7, 6, 4}}; +const std::vector> blockShape5D2 = {{1, 2, 4, 3, 1}, {1, 1, 2, 4, 3}}; +const std::vector> cropsBegin5D2 = {{0, 0, 1, 2, 0}, {0, 0, 1, 0, 1}}; +const std::vector> cropsEnd5D2 = {{0, 0, 1, 0, 1}, {0, 0, 1, 1, 1}}; +const std::vector> inputShapes5D2 = {{48, 16, 3, 3, 3}, {24, 32, 5, 3, 5}}; const std::vector cpuParams_5D = { CPUSpecificParams({nCdhw16c}, {nCdhw16c}, {}, {}), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp index 73bae4cb35e9d7..64dd742000c88e 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp @@ -80,15 +80,15 @@ const std::vector precisions = { Precision::BF16 }; -const std::vector> blockShape4D1 = {{1, 2, 1, 2}, {1, 1, 2, 2}, {1, 2, 2, 1}, {1, 2, 2, 2}}; -const std::vector> cropsBegin4D1 = {{0, 0, 0, 1}, {0, 0, 2, 1}, {0, 0, 4, 1}, {0, 0, 4, 3}}; -const std::vector> cropsEnd4D1 = {{0, 0, 0, 1}, {0, 0, 2, 1}, {0, 0, 4, 1}, {0, 0, 2, 3}}; -const std::vector> inputShapes4D1 = {{1, 16, 8, 12}, {1, 32, 8, 8}, {1, 16, 4, 4}, {2, 32, 16, 8}}; +const std::vector> blockShape4D1 = {{1, 2, 1, 2}, {1, 1, 2, 2}, {1, 2, 2, 2}}; +const std::vector> cropsBegin4D1 = {{0, 0, 0, 1}, {0, 0, 2, 1}, {0, 0, 4, 3}}; +const std::vector> cropsEnd4D1 = {{0, 0, 0, 1}, {0, 0, 4, 1}, {0, 0, 2, 3}}; +const std::vector> inputShapes4D1 = {{1, 16, 8, 12}, {1, 32, 8, 8}}; -const std::vector> blockShape4D2 = {{1, 2, 4, 1}, {1, 2, 4, 3}, {1, 4, 4, 1}}; -const std::vector> cropsBegin4D2 = {{0, 0, 0, 0}, {0, 0, 4, 3}, {0, 0, 0, 3}}; -const std::vector> cropsEnd4D2 = {{0, 0, 0, 0}, {0, 0, 4, 0}, {0, 0, 4, 3} }; -const std::vector> inputShapes4D2 = {{1, 16, 8, 12}, {1, 16, 12, 15}, {1, 32, 4, 9} }; +const std::vector> blockShape4D2 = { {1, 2, 4, 3}, {1, 4, 4, 1}}; +const std::vector> cropsBegin4D2 = {{0, 0, 0, 0}, {0, 0, 4, 3}}; +const std::vector> cropsEnd4D2 = {{0, 0, 4, 0}, {0, 0, 4, 3}}; +const std::vector> inputShapes4D2 = {{1, 16, 12, 12}, {1, 32, 12, 15}}; const std::vector cpuParams_4D = { CPUSpecificParams({nChw16c}, {nChw16c}, {}, {}), @@ -131,10 +131,10 @@ INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase1_4D, SpaceToBatchCPUL INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase2_4D, SpaceToBatchCPULayerTest, spaceToBatchParamsSet4D2, SpaceToBatchCPULayerTest::getTestCaseName); -const std::vector> blockShape5D = {{1, 1, 4, 3, 1}, {1, 1, 2, 1, 3}, {1, 2, 4, 1, 1}, {1, 2, 2, 3, 3}}; -const std::vector> cropsBegin5D = {{0, 0, 1, 0, 0}, {0, 0, 1, 0, 3}, {0, 0, 5, 3, 3}, {0, 0, 5, 6, 3}}; -const std::vector> cropsEnd5D = {{0, 0, 1, 0, 0}, {0, 0, 1, 0, 3}, {0, 0, 5, 3, 3}, {0, 0, 5, 6, 3}}; -const std::vector> inputShapes5D = {{2, 16, 6, 6, 12}, {2, 16, 10, 9, 9}, {1, 32, 10, 6, 6}, {1, 32, 6, 9, 6}}; +const std::vector> blockShape5D = {{1, 1, 2, 2, 1}, {1, 2, 4, 1, 3}}; +const std::vector> cropsBegin5D = {{0, 0, 0, 0, 0}, {0, 0, 4, 0, 0}, {0, 0, 0, 2, 3}}; +const std::vector> cropsEnd5D = {{0, 0, 0, 0, 0}, {0, 0, 0, 4, 3}, {0, 0, 4, 2, 3}}; +const std::vector> inputShapes5D = {{2, 16, 4, 6, 12}, {1, 32, 8, 8, 6}, {1, 16, 4, 12, 12}}; const std::vector cpuParams_5D = { CPUSpecificParams({nCdhw16c}, {nCdhw16c}, {}, {}), @@ -157,7 +157,7 @@ const auto spaceToBatchParamsSet5D = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(cpuParams_5D)); -INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase1_5D, SpaceToBatchCPULayerTest, +INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase_5D, SpaceToBatchCPULayerTest, spaceToBatchParamsSet5D, SpaceToBatchCPULayerTest::getTestCaseName); } // namespace