Adjust options

Author: mengweiguo

src/cpp/src/rag/text_embedding_pipeline.cpp

@@ -245,17 +245,16 @@ class TextEmbeddingPipeline::TextEmbeddingPipelineImpl {
             }
         }
 
-        bool should_reshape = (device != "NPU" && (m_config.batch_size.has_value() || m_config.max_length.has_value())) ||
-            (device == "NPU" && m_config.batch_size.has_value() && is_fixed_size);
-        if (should_reshape) {
+        bool should_reshape_non_npu = (device != "NPU" && (m_config.batch_size.has_value() || m_config.max_length.has_value()));
+        bool should_reshape_npu = (device == "NPU" && m_config.batch_size.has_value() && is_fixed_size);
+        if (should_reshape_non_npu || should_reshape_npu) {
             reshape_model(model);
         }
 
         ov::CompiledModel compiled_model;
         if (device == "NPU" && model->is_dynamic()) {
-            const auto is_padding = m_config.pad_to_max_length.has_value() && m_config.pad_to_max_length.value();
-            OPENVINO_ASSERT(!is_padding || config.pooling_type == TextEmbeddingPipeline::PoolingType::MEAN,
-                            "Padding is only supported for the mean post-processing type");
+            OPENVINO_ASSERT(!(is_padding_on_left && is_fixed_size) || config.pooling_type == TextEmbeddingPipeline::PoolingType::MEAN,
+                            "Padding on left is only supported for the mean post-processing type");
 
             auto kv_pos = ov::genai::utils::get_kv_axes_pos(model);
             utils::KVDesc kv_desc;

src/cpp/src/utils.cpp

@@ -608,10 +608,7 @@ void import_npu_model(ov::CompiledModel& compiled,
 }
 
 void export_npu_model(ov::CompiledModel& compiled,
-                        std::string& blob_path) {
-    if (blob_path.empty()) {
-        blob_path = "openvino_model.blob";
-    }
+                        const std::string& blob_path) {
     // Check the path is full
     const int EXT_SIZE = 5; // ".blob"
     if (blob_path.size() < EXT_SIZE) {
@@ -680,6 +677,9 @@ compile_decoder_for_npu_impl(const std::shared_ptr<ov::Model>& model,
         compiled = ov::genai::utils::singleton_core().compile_model(model, "NPU", properties);
         // Also export compiled model if required
         if (export_blob) {
+            if (blob_path.empty()) {
+                blob_path = "openvino_model.blob";
+            }
             export_npu_model(compiled, blob_path);
         }
     }