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

[GPU] Allow crop optimization for static shape(#13710) (#13710)

Browse Source
This commit is contained in:
Paul Youngsoo Ahn 2022-11-02 13:59:18 +09:00 committed by GitHub
parent b48d13c781
commit f7005ca297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/plugins/intel_gpu/src/plugin/ops/split.cpp
View File

@ -14,54 +14,51 @@ namespace ov {
namespace intel_gpu { namespace intel_gpu {
static void CreateCommonSplitOp(Program& p, const std::shared_ptr<ngraph::Node>& op) { static void CreateCommonSplitOp(Program& p, const std::shared_ptr<ngraph::Node>& op) {
auto get_layer_name = [&](size_t idx)->std::string {
return layer_type_name_ID(op) + ((op->get_output_size() == 1)? "" : ".out" + std::to_string(idx));
};
auto inputPrimitives = p.GetInputPrimitiveIDs(op); auto inputPrimitives = p.GetInputPrimitiveIDs(op);
std::string layerName = layer_type_name_ID(op); if (p.use_new_shape_infer() || op->is_dynamic()) {
cldnn::crop_ngraph_op_mode op_mode = cldnn::crop_ngraph_op_mode::variadic_split;
size_t num_splits = 1;
if (ngraph::is_type<ngraph::op::v1::Split>(op)) {
num_splits = ngraph::as_type_ptr<ngraph::op::v1::Split>(op)->get_num_splits();
op_mode = cldnn::crop_ngraph_op_mode::split;
}
auto inPartialShape = op->get_input_partial_shape(0); for (size_t i = 0; i < op->get_output_size(); i++) {
InferenceEngine::SizeVector startOffset(inPartialShape.size()); auto cropPrim = cldnn::crop(get_layer_name(i), inputPrimitives, cldnn::tensor(1), cldnn::tensor(0), op_mode, i, num_splits);
p.add_primitive(*op, cropPrim);
cldnn::crop_ngraph_op_mode op_mode = cldnn::crop_ngraph_op_mode::variadic_split; }
size_t num_splits = 1; } else {
if (ngraph::is_type<ngraph::op::v1::Split>(op)) { auto input_pshape = op->get_input_partial_shape(0);
auto split = ngraph::as_type_ptr<ngraph::op::v1::Split>(op); InferenceEngine::SizeVector start_offset(input_pshape.size());
num_splits = split->get_num_splits(); for (size_t i = 0; i < op->get_output_size(); i++) {
op_mode = cldnn::crop_ngraph_op_mode::split; const auto outPartialShape = op->get_output_partial_shape(i);
}
bool is_single_out_split = op->get_output_size() == 1;
for (size_t i = 0; i < op->get_output_size(); i++) {
std::string outLayerName = layerName + (is_single_out_split ? "" : ".out" + std::to_string(i));
const auto outPatialShape = op->get_output_partial_shape(i);
if (outPatialShape.is_static()) {
NGRAPH_SUPPRESS_DEPRECATED_START NGRAPH_SUPPRESS_DEPRECATED_START
if (outPatialShape.size() != startOffset.size()) { if (outPartialShape.size() != start_offset.size()) {
IE_THROW() << "Invalid dimesions in split layer: " << op->get_friendly_name() IE_THROW() << "Invalid dimesions in split layer: " << op->get_friendly_name()
<< " output: " << op->get_output_tensor_name(i); << " output: " << op->get_output_tensor_name(i);
} }
for (size_t i = 0; i < inPartialShape.size(); i++) { for (size_t idx = 0; idx < input_pshape.size(); idx++) {
if ((outPatialShape[i].get_length() + static_cast<ov::Dimension::value_type>(startOffset[i])) > inPartialShape[i].get_length()) { if ((outPartialShape[idx].get_length() + static_cast<ov::Dimension::value_type>(start_offset[idx])) > input_pshape[idx].get_length()) {
IE_THROW() << "Invalid dimesions in split layer: " << op->get_friendly_name() IE_THROW() << "Invalid dimesions in split layer: " << op->get_friendly_name()
<< " output: " << op->get_output_tensor_name(i); << " output: " << op->get_output_tensor_name(idx);
} }
} }
NGRAPH_SUPPRESS_DEPRECATED_END NGRAPH_SUPPRESS_DEPRECATED_END
auto outTensor = tensor_from_dims(outPatialShape.to_shape(), 1); auto offsetTensor = tensor_from_dims(start_offset, 0);
auto offsetTensor = tensor_from_dims(startOffset, 0); auto outTensor = tensor_from_dims(op->get_output_shape(i), 1);
auto cropPrim = cldnn::crop(outLayerName, inputPrimitives, outTensor, offsetTensor, op_mode, i, num_splits); auto cropPrim = cldnn::crop(get_layer_name(i), inputPrimitives[0], outTensor, offsetTensor);
p.add_primitive(*op, cropPrim); p.add_primitive(*op, cropPrim);
for (size_t i = 0; i < inPartialShape.size(); i++) { for (size_t idx = 0; idx < input_pshape.size(); idx++) {
if (outPatialShape[i] != inPartialShape[i]) { if (outPartialShape[idx] != input_pshape[idx]) {
startOffset[i] += outPatialShape.to_shape()[i]; start_offset[idx] += outPartialShape.to_shape()[idx];
} }
} }
} else {
auto cropPrim = cldnn::crop(outLayerName, inputPrimitives, cldnn::tensor(1), cldnn::tensor(0), op_mode, i, num_splits);
p.add_primitive(*op, cropPrim);
} }
} }
} }