update old models

Author: akorobeinikov

demos/common/cpp/models/include/models/hpe_model_associative_embedding.h

@@ -65,7 +65,6 @@ class HpeAssociativeEmbedding : public ImageModel {
     int targetSize;
     float confidenceThreshold;
     float delta;
-    RESIZE_MODE resizeMode;
 
     std::string embeddingsTensorName;
     std::string heatmapsTensorName;

demos/common/cpp/models/include/models/style_transfer_model.h

@@ -36,7 +36,6 @@ class StyleTransferModel : public ImageModel {
     /// @param layout - model input layout
     StyleTransferModel(const std::string& modelFileName, const std::string& layout = "");
 
-    std::shared_ptr<InternalModelData> preprocess(const InputData& inputData, ov::InferRequest& request) override;
     std::unique_ptr<ResultBase> postprocess(InferenceResult& infResult) override;
 
 protected:

demos/common/cpp/models/src/hpe_model_associative_embedding.cpp

@@ -53,8 +53,10 @@ HpeAssociativeEmbedding::HpeAssociativeEmbedding(const std::string& modelFileNam
       aspectRatio(aspectRatio),
       targetSize(targetSize),
       confidenceThreshold(confidenceThreshold),
-      delta(delta),
-      resizeMode(resizeMode) {}
+      delta(delta) {
+        resizeMode = resizeMode;
+        interpolationMode = CUBIC;
+      }
 
 void HpeAssociativeEmbedding::prepareInputsOutputs(std::shared_ptr<ov::Model>& model) {
     // --------------------------- Configure input & output -------------------------------------------------
@@ -136,7 +138,7 @@ std::shared_ptr<InternalModelData> HpeAssociativeEmbedding::preprocess(const Inp
                                                                        ov::InferRequest& request) {
     auto& image = inputData.asRef<ImageInputData>().inputImage;
     cv::Rect roi;
-    auto paddedImage = resizeImageExt(image, inputLayerSize.width, inputLayerSize.height, resizeMode, true, &roi);
+    auto paddedImage = resizeImageExt(image, inputLayerSize.width, inputLayerSize.height, resizeMode, interpolationMode, &roi);
     if (inputLayerSize.height - stride >= roi.height || inputLayerSize.width - stride >= roi.width) {
         slog::warn << "\tChosen model aspect ratio doesn't match image aspect ratio" << slog::endl;
     }

demos/common/cpp/models/src/hpe_model_openpose.cpp

@@ -50,7 +50,10 @@ HPEOpenPose::HPEOpenPose(const std::string& modelFileName,
     : ImageModel(modelFileName, false, layout),
       aspectRatio(aspectRatio),
       targetSize(targetSize),
-      confidenceThreshold(confidenceThreshold) {}
+      confidenceThreshold(confidenceThreshold) {
+        resizeMode = RESIZE_KEEP_ASPECT;
+        interpolationMode = CUBIC;
+      }
 
 void HPEOpenPose::prepareInputsOutputs(std::shared_ptr<ov::Model>& model) {
     // --------------------------- Configure input & output -------------------------------------------------
@@ -139,7 +142,7 @@ std::shared_ptr<InternalModelData> HPEOpenPose::preprocess(const InputData& inpu
     auto& image = inputData.asRef<ImageInputData>().inputImage;
     cv::Rect roi;
     auto paddedImage =
-        resizeImageExt(image, inputLayerSize.width, inputLayerSize.height, RESIZE_KEEP_ASPECT, true, &roi);
+        resizeImageExt(image, inputLayerSize.width, inputLayerSize.height, resizeMode, interpolationMode, &roi);
     if (inputLayerSize.width < roi.width)
         throw std::runtime_error("The image aspect ratio doesn't fit current model shape");
 

demos/common/cpp/models/src/style_transfer_model.cpp

@@ -81,17 +81,6 @@ void StyleTransferModel::prepareInputsOutputs(std::shared_ptr<ov::Model>& model)
     model = ppp.build();
 }
 
-std::shared_ptr<InternalModelData> StyleTransferModel::preprocess(const InputData& inputData,
-                                                                  ov::InferRequest& request) {
-    auto imgData = inputData.asRef<ImageInputData>();
-    auto& img = imgData.inputImage;
-
-    cv::Mat resizedImage;
-    resizedImage = resizeImageExt(img, netInputWidth, netInputHeight);
-    request.set_input_tensor(wrapMat2Tensor(resizedImage));
-    return std::make_shared<InternalImageModelData>(img.cols, img.rows);
-}
-
 std::unique_ptr<ResultBase> StyleTransferModel::postprocess(InferenceResult& infResult) {
     ImageResult* result = new ImageResult;
     *static_cast<ResultBase*>(result) = static_cast<ResultBase&>(infResult);

demos/common/cpp/utils/include/utils/image_utils.h

@@ -1,5 +1,5 @@
 /*
-// Copyright (C) 2021 Intel Corporation
+// Copyright (C) 2021-2022 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,4 +24,12 @@ enum RESIZE_MODE {
     RESIZE_KEEP_ASPECT_LETTERBOX
 };
 
-cv::Mat resizeImageExt(const cv::Mat& mat, int width, int height, RESIZE_MODE resizeMode = RESIZE_FILL, bool hqResize = false, cv::Rect* roi = nullptr);
+enum INTERPOLATION_MODE {
+    NEAREST,
+    LINEAR,
+    CUBIC,
+    AREA
+};
+
+cv::Mat resizeImageExt(const cv::Mat& mat, int width, int height, RESIZE_MODE resizeMode = RESIZE_FILL,
+                       INTERPOLATION_MODE interpolationMode = LINEAR, cv::Rect* roi = nullptr);

demos/common/cpp/utils/include/utils/nms.hpp

@@ -1,5 +1,5 @@
 /*
-// Copyright (C) 2021 Intel Corporation
+// Copyright (C) 2021-2022 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,26 @@
 #include <vector>
 
 
+struct Anchor {
+        float left;
+        float top;
+        float right;
+        float bottom;
+
+        float getWidth() const {
+            return (right - left) + 1.0f;
+        }
+        float getHeight() const {
+            return (bottom - top) + 1.0f;
+        }
+        float getXCenter() const {
+            return left + (getWidth() - 1.0f) / 2.0f;
+        }
+        float getYCenter() const {
+            return top + (getHeight() - 1.0f) / 2.0f;
+        }
+    };
+
 template <typename Anchor>
 std::vector<int> nms(const std::vector<Anchor>& boxes, const std::vector<float>& scores,
                      const float thresh, bool includeBoundaries=false) {

demos/common/cpp/utils/src/image_utils.cpp

@@ -1,5 +1,5 @@
 /*
-// Copyright (C) 2021 Intel Corporation
+// Copyright (C) 2021-2022 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,18 +16,18 @@
 
 #include "utils/image_utils.h"
 
-cv::Mat resizeImageExt(const cv::Mat& mat, int width, int height, RESIZE_MODE resizeMode, bool hqResize, cv::Rect* roi) {
+cv::Mat resizeImageExt(const cv::Mat& mat, int width, int height, RESIZE_MODE resizeMode,
+                       INTERPOLATION_MODE interpolationMode, cv::Rect* roi) {
     if (width == mat.cols && height == mat.rows) {
         return mat;
     }
 
     cv::Mat dst;
-    int interpMode = hqResize ? cv::INTER_CUBIC : cv::INTER_LINEAR;
 
     switch (resizeMode) {
     case RESIZE_FILL:
     {
-        cv::resize(mat, dst, cv::Size(width, height), interpMode);
+        cv::resize(mat, dst, cv::Size(width, height), interpolationMode);
         if (roi) {
             *roi = cv::Rect(0, 0, width, height);
         }
@@ -38,7 +38,7 @@ cv::Mat resizeImageExt(const cv::Mat& mat, int width, int height, RESIZE_MODE re
     {
         double scale = std::min(static_cast<double>(width) / mat.cols, static_cast<double>(height) / mat.rows);
         cv::Mat resizedImage;
-        cv::resize(mat, resizedImage, cv::Size(0, 0), scale, scale, interpMode);
+        cv::resize(mat, resizedImage, cv::Size(0, 0), scale, scale, interpolationMode);
 
         int dx = resizeMode == RESIZE_KEEP_ASPECT ? 0 : (width - resizedImage.cols) / 2;
         int dy = resizeMode == RESIZE_KEEP_ASPECT ? 0 : (height - resizedImage.rows) / 2;