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

[CPU] Fix condition for blocked layout in StridedSlice (#7245)

Browse Source
This commit is contained in:
Aleksandr Pertovsky 2021-10-21 13:33:40 +03:00 committed by GitHub
parent 2952ba70af
commit 7f1e8617fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inference-engine/src/mkldnn_plugin/nodes/mkldnn_strided_slice_node.cpp
View File

@ -231,7 +231,9 @@ void MKLDNNStridedSliceNode::initSupportedPrimitiveDescriptors() {
std::vector<LayoutType> supportedTypes;
if (nDims > 2 && params.equalDims) {
auto canUseBlocked = [=](const size_t blockSize) {
return srcDims[1] % blockSize == 0 && abs(stride[1]) == 1 && (begin[1] > srcDims[1] || begin[1] % blockSize == 0);
auto channelBeginNormalized = begin[1] > 0 ? begin[1] : begin[1] + srcDims[1];
return srcDims[1] % blockSize == 0 && abs(stride[1]) == 1 &&
(channelBeginNormalized > srcDims[1] || channelBeginNormalized % blockSize == 0 || channelBeginNormalized < 0 || beginMask[1] == 0);
};
supportedTypes.push_back(LayoutType::nspc);

35
inference-engine/tests/functional/plugin/cpu/single_layer_tests/strided_slice.cpp
View File

@ -299,6 +299,41 @@ const auto StridedSliceParamsBlocked5D = ::testing::Combine(
INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Blocked_5D, StridedSliceLayerCPUTest, StridedSliceParamsBlocked5D, StridedSliceLayerCPUTest::getTestCaseName);
/* Descriptors check */
class StridedSliceLayerDescriptorCPUTest : public StridedSliceLayerCPUTest {};
const std::vector<StridedSliceSpecificParams> testCasesPlanar4D = {
StridedSliceSpecificParams{ {1, 32, 112, 112 }, { 0, -28, 0, 0 }, { 0, 2147483647, 0, 0 }, { 1, 1, 1, 1 }, { 1, 0, 1, 1 },
{ 1, 0, 1, 1 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } },
StridedSliceSpecificParams{ { 1, 17, 32, 20 }, { 0, 0, 10, 0 }, { 1, 17, 20, 10 }, { 1, 1, 1, 1 },
{ 0, 0, 0, 0 }, { 0, 0, 0, 1 }, { }, { }, { } },
StridedSliceSpecificParams{ { 1, 16, 32, 32 }, { 0, 5, 0, 0 }, { 1, 20, 28, 27 }, { 1, 1, 1, 1 },
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { }, { }, { } },
StridedSliceSpecificParams{ { 1, 16, 100, 1, 1 }, { 0, -1, 0, 0 }, { 0, 0, 0, 0 }, { 1, 1, 1, 1 },
{ 1, 0, 1, 0 }, { 1, 0, 1, 0 }, { }, { 0, 1, 0, 1 }, {} },
StridedSliceSpecificParams{ { 2, 3, 4, 5 }, { 0, 0, 0, 0, 0 }, { 0, 2, 3, 4, 5 }, { 1, 1, 1, 1, 1 },
{ 1, 1, 1, 1, 1 }, { 1, 1, 1, 1, 1 }, { 0, 0, 1, 0, 0 }, {}, {} },
};
const auto StridedSliceParamsDescriptorsCheck4D = ::testing::Combine(
::testing::ValuesIn(testCasesPlanar4D),
::testing::Values(InferenceEngine::Precision::FP32),
::testing::Values(CommonTestUtils::DEVICE_CPU),
::testing::Values(additional_config),
::testing::Values(cpuParams_nChw8c));
TEST_P(StridedSliceLayerDescriptorCPUTest, DescriptorsCheck) {
SKIP_IF_CURRENT_TEST_IS_DISABLED()
ASSERT_THROW(LoadNetwork(), InferenceEngine::Exception);
}
INSTANTIATE_TEST_SUITE_P(smoke_StridedSliceLayerDescriptorCPUTest,
StridedSliceLayerDescriptorCPUTest,
StridedSliceParamsDescriptorsCheck4D,
StridedSliceLayerDescriptorCPUTest::getTestCaseName);
} // namespace
} // namespace CPULayerTestsDefinitions