Skip to content

Commit 8c68bc0

Browse files
committed
update code to match openvino 2026.0.0
1 parent a3442ba commit 8c68bc0

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

src/cpp/models/src/classification_model.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ std::unique_ptr<ResultBase> ClassificationModel::get_hierarchical_predictions(In
350350
bool add_raw_scores) {
351351
ClassificationResult* result = new ClassificationResult(infResult.frameId, infResult.metaData);
352352

353-
const ov::Tensor& logitsTensor = infResult.outputsData.find(outputNames[0])->second;
353+
ov::Tensor& logitsTensor = infResult.outputsData.find(outputNames[0])->second;
354354
float* logitsPtr = logitsTensor.data<float>();
355355

356356
auto raw_scores = ov::Tensor();
@@ -411,7 +411,7 @@ ov::Tensor ClassificationModel::reorder_saliency_maps(const ov::Tensor& source_m
411411
}
412412

413413
auto reordered_maps = ov::Tensor(source_maps.get_element_type(), source_maps.get_shape());
414-
const std::uint8_t* source_maps_ptr = static_cast<std::uint8_t*>(source_maps.data());
414+
const std::uint8_t* source_maps_ptr = static_cast<const std::uint8_t*>(source_maps.data());
415415
std::uint8_t* reordered_maps_ptr = static_cast<std::uint8_t*>(reordered_maps.data());
416416

417417
size_t shape_offset = (source_maps.get_shape().size() == 4) ? 1 : 0;

src/cpp/models/src/detection_model_yolox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ std::unique_ptr<ResultBase> ModelYoloX::postprocess(InferenceResult& infResult)
131131
const auto& scale = infResult.internalModelData->asRef<InternalScaleData>();
132132

133133
// Get output tensor
134-
const ov::Tensor& output = infResult.outputsData[outputNames[0]];
134+
ov::Tensor& output = infResult.outputsData[outputNames[0]];
135135
const auto& outputShape = output.get_shape();
136136
float* outputPtr = output.data<float>();
137137

src/cpp/models/src/instance_segmentation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ std::unique_ptr<ResultBase> MaskRCNNModel::postprocess(InferenceResult& infResul
312312
padTop = (netInputHeight - int(std::round(floatInputImgHeight / invertedScaleY))) / 2;
313313
}
314314
}
315-
const Lbm& lbm = filterTensors(infResult.outputsData);
315+
Lbm lbm = filterTensors(infResult.outputsData);
316316
const int64_t* const labels_tensor_ptr = lbm.labels.data<int64_t>();
317317
const float* const boxes = lbm.boxes.data<float>();
318318
size_t objectSize = lbm.boxes.get_shape().back();

src/cpp/models/src/keypoint_detection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ void KeypointDetectionModel::prepareInputsOutputs(std::shared_ptr<ov::Model>& mo
210210
std::unique_ptr<ResultBase> KeypointDetectionModel::postprocess(InferenceResult& infResult) {
211211
KeypointDetectionResult* result = new KeypointDetectionResult(infResult.frameId, infResult.metaData);
212212

213-
const ov::Tensor& pred_x_tensor = infResult.outputsData.find(outputNames[0])->second;
213+
ov::Tensor& pred_x_tensor = infResult.outputsData.find(outputNames[0])->second;
214214
size_t shape_offset = pred_x_tensor.get_shape().size() == 3 ? 1 : 0;
215215
auto pred_x_mat = cv::Mat(cv::Size(static_cast<int>(pred_x_tensor.get_shape()[shape_offset + 1]),
216216
static_cast<int>(pred_x_tensor.get_shape()[shape_offset])),
217217
CV_32F,
218218
pred_x_tensor.data(),
219219
pred_x_tensor.get_strides()[shape_offset]);
220220

221-
const ov::Tensor& pred_y_tensor = infResult.outputsData.find(outputNames[1])->second;
221+
ov::Tensor& pred_y_tensor = infResult.outputsData.find(outputNames[1])->second;
222222
shape_offset = pred_y_tensor.get_shape().size() == 3 ? 1 : 0;
223223
auto pred_y_mat = cv::Mat(cv::Size(static_cast<int>(pred_y_tensor.get_shape()[shape_offset + 1]),
224224
static_cast<int>(pred_y_tensor.get_shape()[shape_offset])),

src/cpp/models/src/segmentation_model.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ void SegmentationModel::prepareInputsOutputs(std::shared_ptr<ov::Model>& model)
222222
std::unique_ptr<ResultBase> SegmentationModel::postprocess(InferenceResult& infResult) {
223223
const auto& inputImgSize = infResult.internalModelData->asRef<InternalImageModelData>();
224224
const auto& outputName = outputNames[0] == feature_vector_name ? outputNames[1] : outputNames[0];
225-
const auto& outTensor = infResult.outputsData[outputName];
225+
auto& outTensor = infResult.outputsData[outputName];
226226
const ov::Shape& outputShape = outTensor.get_shape();
227227
const ov::Layout& outputLayout = getLayoutFromShape(outputShape);
228228
size_t outChannels =

src/cpp/utils/include/utils/ocv_common.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ static inline ov::Tensor wrapMat2Tensor(const cv::Mat& mat) {
3535
}
3636
auto precision = isMatFloat ? ov::element::f32 : ov::element::u8;
3737
struct SharedMatAllocator {
38-
const cv::Mat mat;
38+
cv::Mat mat;
39+
SharedMatAllocator(const cv::Mat& m) : mat(m) {}
3940
void* allocate(size_t bytes, size_t) {
4041
return bytes <= mat.rows * mat.step[0] ? mat.data : nullptr;
4142
}
42-
void deallocate(void*, size_t, size_t) {}
43+
void deallocate(void*, size_t, size_t) noexcept {}
4344
bool is_equal(const SharedMatAllocator& other) const noexcept {
4445
return this == &other;
4546
}
4647
};
47-
return ov::Tensor(precision, ov::Shape{1, height, width, channels}, SharedMatAllocator{mat});
48+
return ov::Tensor(precision, ov::Shape{1, height, width, channels}, ov::Allocator(SharedMatAllocator{mat}));
4849
}
4950

5051
struct IntervalCondition {

src/cpp/utils/src/image_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Output<Node> cropResizeGraph(const ov::Output<ov::Node>& input,
217217
opset10::Constant::create(element::i64, Shape{1}, {1}),
218218
opset10::Constant::create(element::i64, Shape{1}, {h_axis}));
219219
auto then_body_res_1 = std::make_shared<opset10::Result>(then_cropped_frame);
220-
auto then_body = std::make_shared<Model>(NodeVector{then_body_res_1}, ParameterVector{image_t, iw_t, ih_t});
220+
auto then_body = std::make_shared<Model>(ov::ResultVector{then_body_res_1}, ParameterVector{image_t, iw_t, ih_t});
221221

222222
// else_body
223223
auto image_e = std::make_shared<opset10::Parameter>(element::u8, PartialShape{-1, -1, -1, 3});
@@ -235,7 +235,7 @@ Output<Node> cropResizeGraph(const ov::Output<ov::Node>& input,
235235
opset10::Constant::create(element::i64, Shape{1}, {1}),
236236
opset10::Constant::create(element::i64, Shape{1}, {w_axis}));
237237
auto else_body_res_1 = std::make_shared<opset10::Result>(else_cropped_frame);
238-
auto else_body = std::make_shared<Model>(NodeVector{else_body_res_1}, ParameterVector{image_e, iw_e, ih_e});
238+
auto else_body = std::make_shared<Model>(ov::ResultVector{else_body_res_1}, ParameterVector{image_e, iw_e, ih_e});
239239

240240
// if operator
241241
auto condition = std::make_shared<opset10::Greater>(ih, iw);

0 commit comments

Comments
 (0)