Fixes for Whisper stateful/static pipelines

- fix encode reset based on used device in stateful pipeline
- fix STATIC_PIPELINE property option usage for Whisper static

Author: eshiryae

src/cpp/src/whisper/pipeline_static.cpp

@@ -990,18 +990,22 @@ WhisperPipeline::StaticWhisperPipeline::StaticWhisperPipeline(const std::filesys
     , m_sampler(m_tokenizer) {
     ov::Core core = utils::singleton_core();
 
-    auto encoder_model = core.read_model(models_path / "openvino_encoder_model.xml", {}, properties);
+    // Remove "STATIC_PIPELINE" as we don't need to pass it further
+    auto model_properties = properties;
+    utils::pop_option(model_properties, "STATIC_PIPELINE");
+
+    auto encoder_model = core.read_model(models_path / "openvino_encoder_model.xml", {}, model_properties);
     reshape_to_static_encoder(encoder_model, m_feature_extractor.feature_size);
     auto last_hidden_state_shape = get_encoder_hidden_state_shape(encoder_model);
 
     std::shared_ptr<ov::Model> decoder_model;
     std::shared_ptr<ov::Model> decoder_with_past_model;
 
     if (std::filesystem::exists(models_path / "openvino_decoder_with_past_model.xml") ) {
-        decoder_model = core.read_model(models_path / "openvino_decoder_model.xml", {}, properties);
-        decoder_with_past_model = core.read_model(models_path / "openvino_decoder_with_past_model.xml", {}, properties);
+        decoder_model = core.read_model(models_path / "openvino_decoder_model.xml", {}, model_properties);
+        decoder_with_past_model = core.read_model(models_path / "openvino_decoder_with_past_model.xml", {}, model_properties);
     } else {
-        auto model = core.read_model(models_path / "openvino_decoder_model.xml", {}, properties);
+        auto model = core.read_model(models_path / "openvino_decoder_model.xml", {}, model_properties);
         ov::pass::StatefulToStateless().run_on_model(model);
 
         decoder_model = prepare_decoder_model(model);
@@ -1030,15 +1034,15 @@ WhisperPipeline::StaticWhisperPipeline::StaticWhisperPipeline(const std::filesys
     preprocess_decoder(decoder_with_past_model);
 
     ov::CompiledModel compiled_model;
-    compiled_model = core.compile_model(encoder_model, "NPU", properties);
+    compiled_model = core.compile_model(encoder_model, "NPU", model_properties);
     ov::genai::utils::print_compiled_model_properties(compiled_model, "Static Whisper encoder model");
     m_models.encoder = compiled_model.create_infer_request();
 
-    compiled_model = core.compile_model(decoder_with_past_model, "NPU", properties);
+    compiled_model = core.compile_model(decoder_with_past_model, "NPU", model_properties);
     ov::genai::utils::print_compiled_model_properties(compiled_model, "Static Whisper decoder with past model");
     m_models.decoder_with_past = compiled_model.create_infer_request();
 
-    compiled_model = core.compile_model(decoder_model, "NPU", properties);
+    compiled_model = core.compile_model(decoder_model, "NPU", model_properties);
     ov::genai::utils::print_compiled_model_properties(compiled_model, "Static Whisper decoder model");
     m_models.decoder = compiled_model.create_infer_request();
 

src/cpp/src/whisper/whisper.cpp

@@ -212,8 +212,8 @@ ov::Tensor encode(ov::InferRequest& request,
     raw_metrics.m_inference_durations[0] += MicroSeconds(infer_ms);
 
     // reset input tensor
-    auto m_is_npu = true;
-    uint8_t batch_size = m_is_npu ? 1 : 0;
+    auto devices = request.get_compiled_model().get_property(ov::execution_devices);
+    uint8_t batch_size = (devices[0] == "NPU") ? 1 : 0;
     request.set_tensor("input_features", ov::Tensor(ov::element::f32, {batch_size, feature_size, nb_max_frames}));
 
     return request.get_tensor("last_hidden_state");