Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes dynamic shapes #27776

Merged
Merged
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -54,9 +54,8 @@ void check_level_zero_attributes_match(const IODescriptor& ioDescriptor, const A
'\n' + "Given: " + std::to_string(ovDimensions.size()));

for (size_t index = 0; index < ovDimensions.size(); ++index) {
OPENVINO_ASSERT(
ioDescriptor.shapeFromCompiler.is_dynamic() || ovDimensions[index] == zeDescriptor.info.dims[index],
"Shape mismatch for input/output named " + ioDescriptor.nameFromCompiler);
OPENVINO_ASSERT(ovDimensions[index] == zeDescriptor.info.dims[index],
"Shape mismatch for input/output named " + ioDescriptor.nameFromCompiler);
}
for (size_t index = ovDimensions.size(); index < ZE_MAX_GRAPH_ARGUMENT_DIMENSIONS_SIZE; ++index) {
OPENVINO_ASSERT(zeDescriptor.info.dims[index] == 0 || zeDescriptor.info.dims[index] == 1,
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@
#include "intel_npu/utils/zero/zero_api.hpp"
#include "intel_npu/utils/zero/zero_result.hpp"
#include "intel_npu/utils/zero/zero_wrappers.hpp"
#include "openvino/core/dimension.hpp"
#include "openvino/core/model.hpp"
#include "openvino/core/partial_shape.hpp"

#define NotSupportQuery(T) (T <= ZE_GRAPH_EXT_VERSION_1_2)

@@ -400,7 +402,8 @@ ze_graph_handle_t ZeGraphExtWrappers::getGraphHandle(const std::vector<uint8_t>&
static IODescriptor getIODescriptor(const ze_graph_argument_properties_3_t& arg,
const std::optional<ze_graph_argument_metadata_t>& metadata) {
ov::element::Type_t precision = toOVElementType(arg.devicePrecision);
ov::Shape shapeFromCompiler, shapeFromIRModel;
ov::Shape shapeFromCompiler;
ov::PartialShape shapeFromIRModel;
std::unordered_set<std::string> outputTensorNames;

for (uint32_t id = 0; id < arg.associated_tensor_names_count; id++) {
@@ -410,8 +413,17 @@ static IODescriptor getIODescriptor(const ze_graph_argument_properties_3_t& arg,
shapeFromCompiler.push_back(arg.dims[id]);
}
if (metadata.has_value()) {
const auto dynamicDim = std::numeric_limits<uint64_t>::max();
shapeFromIRModel.reserve(metadata->shape_size);
for (uint32_t id = 0; id < metadata->shape_size; id++) {
shapeFromIRModel.push_back(metadata->shape[id]);
if (metadata->shape[id] != dynamicDim) {
shapeFromIRModel.push_back(metadata->shape[id]);
} else {
// lower bound is ignored, so we set it to 1 just to satisfy the Dimension constructor,
// upper bound is set to the value from shapeFromCompiler as it is filled with upper bounds
// in case of dynamic dimensions
shapeFromIRModel.push_back(ov::Dimension(1, shapeFromCompiler[id]));
}
}
}

@@ -433,7 +445,7 @@ static IODescriptor getIODescriptor(const ze_graph_argument_properties_3_t& arg,

return {std::move(nameFromCompiler),
precision,
std::move(shapeFromCompiler),
shapeFromCompiler,
isStateInput,
isStateOutput,
isShapeTensor,
26 changes: 16 additions & 10 deletions src/plugins/intel_npu/tools/single-image-test/main.cpp
Original file line number Diff line number Diff line change
@@ -1569,8 +1569,8 @@ std::pair<TensorMap, ProfVec> runInfer(ov::InferRequest& inferRequest, ov::Compi

TensorMap out;
for (const auto& outputInfo : compiledModel.outputs()) {
const std::string layer_name = outputInfo.get_any_name();
out.insert({layer_name, inferRequest.get_tensor(layer_name)});
const std::string layerName = outputInfo.get_any_name();
out.insert({layerName, inferRequest.get_tensor(layerName)});
}

ProfVec profData{};
@@ -1807,11 +1807,17 @@ bool testMeanIoU(const TensorMap& outputs, const TensorMap& references, const La
}

static ov::Shape parseDataShape(const std::string& dataShapeStr) {
std::vector<size_t> dataShape;
std::istringstream ss(dataShapeStr);
std::string token;
while (std::getline(ss, token, ',')) {
dataShape.push_back(std::stoul(token));
std::vector<uint64_t> dataShape;
std::stringstream ss(dataShapeStr);

char ch; // To discard non-numeric characters
int64_t dim;
while (ss >> ch) {
if (std::isdigit(ch)) {
ss.putback(ch);
ss >> dim;
dataShape.push_back(dim);
}
}
return ov::Shape(dataShape);
}
@@ -1906,11 +1912,11 @@ static int runSingleImageTest() {
auto model = core.read_model(FLAGS_network);
nameIOTensors(model);

auto inputs_info = std::const_pointer_cast<ov::Model>(model)->inputs();
InputsInfo info_map;
auto inputsInfo = std::const_pointer_cast<ov::Model>(model)->inputs();
InputsInfo infoMap;

std::cout << "Performing reshape" << std::endl;
reshape(std::move(inputs_info), info_map, model, FLAGS_shape,
reshape(std::move(inputsInfo), infoMap, model, FLAGS_shape,
FLAGS_override_model_batch_size, FLAGS_device);

ov::preprocess::PrePostProcessor ppp(model);