Cover detection

Author: sovrasov

src/cpp/src/tasks/detection.cpp

@@ -12,23 +12,19 @@
 #include "utils/tensor.h"
 
 DetectionModel DetectionModel::load(const std::string& model_path, const ov::AnyMap& configuration) {
-    auto core = ov::Core();
-    std::shared_ptr<ov::Model> model = core.read_model(model_path);
+    auto adapter = std::make_shared<OpenVINOInferenceAdapter>();
+    adapter->loadModelFile(model_path, "", {}, false);
 
-    if (model->has_rt_info("model_info", "model_type")) {
-        std::cout << "has model type in info: " << model->get_rt_info<std::string>("model_info", "model_type")
-                  << std::endl;
-    } else {
-        throw std::runtime_error("Incorrect or unsupported model_type");
-    }
+    std::string model_type;
+    model_type = utils::get_from_any_maps("model_type", adapter->getModelConfig(), {}, model_type);
+    transform(model_type.begin(), model_type.end(), model_type.begin(), ::tolower);
 
-    if (utils::model_has_embedded_processing(model)) {
-        std::cout << "model already was serialized" << std::endl;
-    } else {
-        SSD::serialize(model);
+    if (model_type.empty() || model_type != "ssd") {
+        throw std::runtime_error("Incorrect or unsupported model_type, expected: ssd");
     }
-    auto adapter = std::make_shared<OpenVINOInferenceAdapter>();
-    adapter->loadModel(model, core, "AUTO");
+    adapter->applyModelTransform(SSD::serialize);
+    adapter->compileModel("AUTO", {});
+
     return DetectionModel(std::make_unique<SSD>(adapter), configuration);
 }
 

src/cpp/src/tasks/detection/ssd.cpp

@@ -68,6 +68,10 @@ std::map<std::string, ov::Tensor> SSD::preprocess(cv::Mat image) {
 }
 
 void SSD::serialize(std::shared_ptr<ov::Model> ov_model) {
+    if (utils::model_has_embedded_processing(ov_model)) {
+        std::cout << "model already was serialized" << std::endl;
+        return;
+    }
     auto output_mode = ov_model->outputs().size() > 1 ? SSDOutputMode::multi : SSDOutputMode::single;
 
     auto input_tensor = ov_model->inputs()[0];