Revert "remove auto resize"

This reverts commit 6d9f0cd.

Author: ivikhrev

demos/classification_benchmark_demo/cpp/main.cpp

@@ -42,6 +42,7 @@ static const char num_inf_req_message[] = "Optional. Number of infer requests.";
 static const char image_grid_resolution_message[] = "Optional. Set image grid resolution in format WxH. "
                                                     "Default value is 1280x720.";
 static const char ntop_message[] = "Optional. Number of top results. Default value is 5. Must be >= 1.";
+static const char input_resizable_message[] = "Optional. Enables resizable input.";
 static const char no_show_message[] = "Optional. Disable showing of processed images.";
 static const char execution_time_message[] = "Optional. Time in seconds to execute program. "
                                              "Default is -1 (infinite time).";
@@ -59,6 +60,7 @@ DEFINE_string(nstreams, "", num_streams_message);
 DEFINE_uint32(nireq, 0, num_inf_req_message);
 DEFINE_uint32(nt, 5, ntop_message);
 DEFINE_string(res, "1280x720", image_grid_resolution_message);
+DEFINE_bool(auto_resize, false, input_resizable_message);
 DEFINE_bool(no_show, false, no_show_message);
 DEFINE_uint32(time, std::numeric_limits<gflags::uint32>::max(), execution_time_message);
 DEFINE_string(u, "", utilization_monitors_message);
@@ -71,6 +73,7 @@ static void showUsage() {
     std::cout << "    -h                        " << help_message << std::endl;
     std::cout << "    -i \"<path>\"               " << image_message << std::endl;
     std::cout << "    -m \"<path>\"               " << model_message << std::endl;
+    std::cout << "    -auto_resize              " << input_resizable_message << std::endl;
     std::cout << "    -labels \"<path>\"          " << labels_message << std::endl;
     std::cout << "    -layout \"<string>\"        " << layout_message << std::endl;
     std::cout << "    -gt \"<path>\"              " << gt_message << std::endl;
@@ -141,7 +144,7 @@ int main(int argc, char *argv[]) {
                 i--;
             } else {
                 readerMetrics.update(readingStart);
-                // Clone cropped image to keep memory layout dense to enable openvino auto resize
+                // Clone cropped image to keep memory layout dense to enable -auto_resize
                 inputImages.push_back(centerSquareCrop(tmpImage).clone());
                 size_t lastSlashIdx = name.find_last_of("/\\");
                 if (lastSlashIdx != std::string::npos) {
@@ -201,7 +204,7 @@ int main(int argc, char *argv[]) {
         slog::info << ov::get_openvino_version() << slog::endl;
         ov::Core core;
 
-        AsyncPipeline pipeline(std::unique_ptr<ModelBase>(new ClassificationModel(FLAGS_m, FLAGS_nt, labels, FLAGS_layout)),
+        AsyncPipeline pipeline(std::unique_ptr<ModelBase>(new ClassificationModel(FLAGS_m, FLAGS_nt, FLAGS_auto_resize, labels, FLAGS_layout)),
             ConfigFactory::getUserConfig(FLAGS_d, FLAGS_nireq, FLAGS_nstreams, FLAGS_nthreads), core);
 
         Presenter presenter(FLAGS_u, 0);

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

@@ -27,10 +27,12 @@ class ClassificationModel : public ImageModel {
     /// @param modelFileName name of model to load.
     /// @param nTop - number of top results.
     /// Any detected object with confidence lower than this threshold will be ignored.
+    /// @param useAutoResize - if true, image will be resized by openvino.
+    /// Otherwise, image will be preprocessed and resized using OpenCV routines.
     /// @param labels - array of labels for every class.
     /// @param layout - model input layout
-    ClassificationModel(const std::string& modelFileName, size_t nTop, const std::vector<std::string>& labels,
-        const std::string& layout = "");
+    ClassificationModel(const std::string& modelFileName, size_t nTop, bool useAutoResize,
+        const std::vector<std::string>& labels, const std::string& layout = "");
 
     std::unique_ptr<ResultBase> postprocess(InferenceResult& infResult) override;
 

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

@@ -25,11 +25,13 @@ class DetectionModel : public ImageModel {
     /// @param modelFileName name of model to load
     /// @param confidenceThreshold - threshold to eliminate low-confidence detections.
     /// Any detected object with confidence lower than this threshold will be ignored.
+    /// @param useAutoResize - if true, image will be resized by openvino.
+    /// Otherwise, image will be preprocessed and resized using OpenCV routines.
     /// @param labels - array of labels for every class. If this array is empty or contains less elements
     /// than actual classes number, default "Label #N" will be shown for missing items.
     /// @param layout - model input layout
-    DetectionModel(const std::string& modelFileName, float confidenceThreshold, const std::vector<std::string>& labels,
-        const std::string& layout = "");
+    DetectionModel(const std::string& modelFileName, float confidenceThreshold, bool useAutoResize,
+        const std::vector<std::string>& labels, const std::string& layout = "");
 
     static std::vector<std::string> loadLabels(const std::string& labelFilename);
 

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

@@ -36,8 +36,8 @@ class ModelFaceBoxes : public DetectionModel {
     };
     static const int INIT_VECTOR_SIZE = 200;
 
-    ModelFaceBoxes(const std::string& modelFileName, float confidenceThreshold, float boxIOUThreshold,
-        const std::string& layout = "");
+    ModelFaceBoxes(const std::string& modelFileName, float confidenceThreshold, bool useAutoResize,
+        float boxIOUThreshold, const std::string& layout = "");
     std::unique_ptr<ResultBase> postprocess(InferenceResult& infResult) override;
 
 protected:

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

@@ -42,10 +42,11 @@ class ModelRetinaFace
     /// @param model_name name of model to load
     /// @param confidenceThreshold - threshold to eliminate low-confidence detections.
     /// Any detected object with confidence lower than this threshold will be ignored.
+    /// @param useAutoResize - if true, image will be resized by openvino.
     /// @param boxIOUThreshold - threshold for NMS boxes filtering, varies in [0.0, 1.0] range.
     /// @param layout - model input layout
-    ModelRetinaFace(const std::string& model_name, float confidenceThreshold, float boxIOUThreshold,
-        const std::string& layout = "");
+    ModelRetinaFace(const std::string& model_name, float confidenceThreshold, bool useAutoResize,
+        float boxIOUThreshold, const std::string& layout = "");
     std::unique_ptr<ResultBase> postprocess(InferenceResult& infResult) override;
 
 protected:

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

@@ -46,10 +46,11 @@ class ModelRetinaFacePT : public DetectionModel {
     /// @param model_name name of model to load
     /// @param confidenceThreshold - threshold to eliminate low-confidence detections.
     /// Any detected object with confidence lower than this threshold will be ignored.
+    /// @param useAutoResize - if true, image will be resized by openvino.
     /// @param boxIOUThreshold - threshold for NMS boxes filtering, varies in [0.0, 1.0] range.
     /// @param layout - model input layout
-    ModelRetinaFacePT(const std::string& modelFileName, float confidenceThreshold, float boxIOUThreshold,
-        const std::string& layout = "");
+    ModelRetinaFacePT(const std::string& modelFileName, float confidenceThreshold, bool useAutoResize,
+        float boxIOUThreshold, const std::string& layout = "");
     std::unique_ptr<ResultBase> postprocess(InferenceResult& infResult) override;
 
 protected:

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

@@ -27,11 +27,13 @@ class ModelSSD : public DetectionModel {
     /// @param modelFileName name of model to load
     /// @param confidenceThreshold - threshold to eliminate low-confidence detections.
     /// Any detected object with confidence lower than this threshold will be ignored.
+    /// @param useAutoResize - if true, image will be resized by openvino.
+    /// Otherwise, image will be preprocessed and resized using OpenCV routines.
     /// @param labels - array of labels for every class. If this array is empty or contains less elements
     /// than actual classes number, default "Label #N" will be shown for missing items.
     /// @param layout - model input layout
     ModelSSD(const std::string& modelFileName,
-        float confidenceThreshold,
+        float confidenceThreshold, bool useAutoResize,
         const std::vector<std::string>& labels = std::vector<std::string>(),
         const std::string& layout = "");
 

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

@@ -50,6 +50,8 @@ class ModelYolo : public DetectionModel {
     /// @param modelFileName name of model to load
     /// @param confidenceThreshold - threshold to eliminate low-confidence detections.
     /// Any detected object with confidence lower than this threshold will be ignored.
+    /// @param useAutoResize - if true, image will be resized by openvino.
+    /// Otherwise, image will be preprocessed and resized using OpenCV routines.
     /// @param useAdvancedPostprocessing - if true, an advanced algorithm for filtering/postprocessing will be used
     /// (with better processing of multiple crossing objects). Otherwise, classic algorithm will be used.
     /// @param boxIOUThreshold - threshold to treat separate output regions as one object for filtering
@@ -59,7 +61,7 @@ class ModelYolo : public DetectionModel {
     /// @param anchors - vector of anchors coordinates. Required for YOLOv4, for other versions it may be omitted.
     /// @param masks - vector of masks values. Required for YOLOv4, for other versions it may be omitted.
     /// @param layout - model input layout
-    ModelYolo(const std::string& modelFileName, float confidenceThreshold,
+    ModelYolo(const std::string& modelFileName, float confidenceThreshold, bool useAutoResize,
         bool useAdvancedPostprocessing = true, float boxIOUThreshold = 0.5, const std::vector<std::string>& labels = std::vector<std::string>(),
         const std::vector<float>& anchors = std::vector<float>(), const std::vector<int64_t>& masks = std::vector<int64_t>(),
         const std::string& layout = "");

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

@@ -20,10 +20,10 @@
 #include <opencv2/opencv.hpp>
 #include <openvino/openvino.hpp>
 #include <utils/image_utils.h>
-#include "models/model_base.h"
+#include "models/image_model.h"
 #include <models/results.h>
 
-class HpeAssociativeEmbedding : public ModelBase {
+class HpeAssociativeEmbedding : public ImageModel {
 public:
     /// Constructor
     /// @param modelFileName name of model to load

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

@@ -23,13 +23,15 @@ class ImageModel : public ModelBase {
 public:
     /// Constructor
     /// @param modelFileName name of model to load
+    /// @param useAutoResize - if true, image is resized by openvino
     /// @param layout - model input layout
-    ImageModel(const std::string& modelFileName, const std::string& layout = "")
-        : ModelBase(modelFileName, layout) {}
+    ImageModel(const std::string& modelFileName, bool useAutoResize, const std::string& layout = "");
 
     virtual std::shared_ptr<InternalModelData> preprocess(const InputData& inputData, ov::InferRequest& request) override;
 
 protected:
+    bool useAutoResize;
+
     size_t netInputHeight = 0;
     size_t netInputWidth = 0;
 };