Hide SharedMatAllocator (#131)

Author: Wovchena

model_api/cpp/models/src/detection_model_ssd.cpp

@@ -89,13 +89,12 @@ std::string ModelSSD::ModelType = "ssd";
 
 std::shared_ptr<InternalModelData> ModelSSD::preprocess(const InputData& inputData, InferenceInput& input) {
     if (inputNames.size() > 1) {
-        cv::Mat info(cv::Size(1, 3), CV_32SC1);
-        info.at<int>(0, 0) = netInputHeight;
-        info.at<int>(0, 1) = netInputWidth;
-        info.at<int>(0, 2) = 1;
-        ov::Tensor infoInput = ov::Tensor(ov::element::i32, ov::Shape({1, 3}), SharedMatAllocator{info});
-
-        input.emplace(inputNames[1], infoInput);
+        ov::Tensor info{ov::element::i32, ov::Shape({1, 3})};
+        int32_t* data = info.data<int32_t>();
+        data[0] = netInputHeight;
+        data[1] = netInputWidth;
+        data[3] = 1;
+        input.emplace(inputNames[1], std::move(info));
     }
     return DetectionModel::preprocess(inputData, input);
 }

model_api/cpp/models/src/detection_model_yolov3_onnx.cpp

@@ -118,7 +118,7 @@ std::shared_ptr<InternalModelData> ModelYoloV3ONNX::preprocess(const InputData&
     int32_t* data = info.data<int32_t>();
     data[0] = origImg.rows;
     data[1] = origImg.cols;
-    input.emplace(inputNames[1], info);
+    input.emplace(inputNames[1], std::move(info));
     return ImageModel::preprocess(inputData, input);
 }
 

model_api/cpp/utils/include/utils/ocv_common.hpp

@@ -13,8 +13,6 @@
 #include <opencv2/imgproc.hpp>
 #include <openvino/openvino.hpp>
 
-#include "utils/shared_tensor_allocator.hpp"
-
 static inline ov::Tensor wrapMat2Tensor(const cv::Mat& mat) {
     auto matType = mat.type() & CV_MAT_DEPTH_MASK;
     if (matType != CV_8U && matType != CV_32F) {
@@ -35,6 +33,12 @@ static inline ov::Tensor wrapMat2Tensor(const cv::Mat& mat) {
         throw std::runtime_error("Doesn't support conversion from not dense cv::Mat");
     }
     auto precision = isMatFloat ? ov::element::f32 : ov::element::u8;
+    struct SharedMatAllocator {
+        const cv::Mat mat;
+        void* allocate(size_t bytes, size_t) {return bytes <= mat.rows * mat.step[0] ? mat.data : nullptr;}
+        void deallocate(void*, size_t, size_t) {}
+        bool is_equal(const SharedMatAllocator& other) const noexcept {return this == &other;}
+    };
     return ov::Tensor(precision, ov::Shape{ 1, height, width, channels }, SharedMatAllocator{mat});
 }