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

[IE CLDNN] Fixed dynamic batch for 2D layout (#3992)

Browse Source
This commit is contained in:
Vladimir Paramuzov 2021-02-16 08:43:31 +03:00 committed by GitHub
parent e22d946a56
commit ad21c6d3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inference-engine/src/cldnn_engine/ops/parameter.cpp
View File

@ -36,9 +36,8 @@ void CreateParameterOp(Program& p, const std::shared_ptr<ngraph::op::v0::Paramet
} }
cldnn::tensor dataTensor; cldnn::tensor dataTensor;
cldnn::tensor::value_type batch = (p.m_max_batch <= 1) cldnn::tensor::value_type batch = (p.m_max_batch <= 1) ? (!inputDims.empty() ? TensorValue(inputDims[0]) : 1)
? (inputDims.size() > 3 ? TensorValue(inputDims[0]) : 1) : TensorValue(p.m_curBatch);
: TensorValue(p.m_curBatch);
switch (inputDims.size()) { switch (inputDims.size()) {
case 6: case 6:
dataTensor = cldnn::tensor(cldnn::batch(batch), dataTensor = cldnn::tensor(cldnn::batch(batch),
@ -74,7 +73,7 @@ void CreateParameterOp(Program& p, const std::shared_ptr<ngraph::op::v0::Paramet
break; break;
case 2: case 2:
if (Layout::NCHW == l || NC == l) { if (Layout::NCHW == l || NC == l) {
dataTensor = cldnn::tensor(TensorValue(inputDims[0]), TensorValue(inputDims[1]), 1, 1); dataTensor = cldnn::tensor(batch, TensorValue(inputDims[1]), 1, 1);
} else { } else {
THROW_IE_EXCEPTION << "Unsupported layout (" << l << ") in 2D input " << inputInfo->name(); THROW_IE_EXCEPTION << "Unsupported layout (" << l << ") in 2D input " << inputInfo->name();
} }

2
inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp
View File

@ -56,7 +56,5 @@ std::vector<std::string> disabledTestPatterns() {
// INT8 StridedSlice not supported // INT8 StridedSlice not supported
R"(.*(LPT/StridedSliceTransformation).*)", R"(.*(LPT/StridedSliceTransformation).*)",
// TODO: Issue: 47219
R"(.*DynamicBatchTest.*)",
}; };
} }