update: check_bool_param

Signed-off-by: xipingya <xiping.yan@intel.com>

Author: xipingyan

src/cpp/src/module_genai/modules/md_text_to_speech/md_text_to_speech.cpp

@@ -59,6 +59,7 @@ void TextToSpeechModule::print_static_config() {
         codec_embedding_model_path: "codec_embedding_model.xml"                                               # codec embedding model IR xml path
         code_predictor_ar_model_path: "code_predictor_ar_model"                                               # code predictor autoregressive model directory path
         sample_codec_token_greedy_search: false                                                               # Eanble greedy decoding in sample_codec_token, which is used for fast debugging and also for GPU inference since random sampling is not easy to implement on GPU.
+        merge_ar_and_sce_ov_models: false                                                                     # Merge AR and CSE models into one OV model for better performance. Requires "sample_codec_token_greedy_search=true.
         code_predictor_single_codec_embed_model_path: "code_predictor_single_codec_embed_model"               # code predictor single codec embedding model directory path
         code_predictor_single_codec_embedding_model_path: "code_predictor_single_codec_embedding_model.xml"   # code predictor single codec embedding model IR xml path
         speech_decoder_model_path: "speech_decoder_model.xml"                                                 # speech decoder model IR xml path
@@ -71,10 +72,8 @@ TextToSpeechModule::TextToSpeechModule(const IBaseModuleDesc::PTR& desc,
     : IBaseModule(desc, pipeline_desc),
       m_model_type(model_type),
       m_device(desc->device.empty() ? "CPU" : desc->device) {
-    auto sample_codec_token_greedy_search_str = get_optional_param("sample_codec_token_greedy_search");
-    if (!sample_codec_token_greedy_search_str.empty()) {
-        m_sample_codec_token_greedy_search = str_to_bool(sample_codec_token_greedy_search_str);
-    }
+    m_sample_codec_token_greedy_search = check_bool_param("sample_codec_token_greedy_search", false);
+    m_merge_ar_and_sce_ov_models = check_bool_param("merge_ar_and_sce_ov_models", false);
 }
 
 TextToSpeechModule::~TextToSpeechModule() = default;

src/cpp/src/module_genai/modules/md_text_to_speech/md_text_to_speech.hpp

@@ -70,6 +70,8 @@ class TextToSpeechModule : public IBaseModule {
     bool m_sample_codec_token_greedy_search =
         false;  // Eanble greedy decoding in sample_codec_token, which is used for fast debugging and also for GPU
                 // inference since random sampling is not easy to implement on GPU.
+    bool m_merge_ar_and_sce_ov_models = false;  // Merge AR and CSE models into one OV model for better performance.
+                                                // Requires "sample_codec_token_greedy_search=true.
 };
 
 }

src/cpp/src/module_genai/pipeline/module_base.cpp

@@ -77,17 +77,6 @@ size_t IBaseModule::str_to_size_t(const std::string& str) {
     }
 }
 
-// Convert string to bool. String "true", "True", "TRUE", "1" will be converted to true, and string "false",
-// "False", "FALSE", "0" will be converted to false. Other strings will throw an exception.
-bool IBaseModule::str_to_bool(const std::string& param_item) {
-    if (param_item == "true" || param_item == "True" || param_item == "TRUE" || param_item == "1") {
-        return true;
-    } else if (param_item == "false" || param_item == "False" || param_item == "FALSE" || param_item == "0") {
-        return false;
-    }
-    OPENVINO_THROW("Failed to parse bool from string: " + param_item);
-}
-
 void IBaseModule::init_ov_model() {
     if (m_ov_model == nullptr) {
         m_ov_model = get_ov_model_from_cfg_models_map("ov_model", false);
@@ -167,8 +156,8 @@ void IBaseModule::check_splitted_model() {
     }
 }
 
-bool IBaseModule::check_bool_param(const std::string& param_name, const bool& default_value) {
-    auto p = get_optional_param(param_name);
+bool IBaseModule::check_bool_param(const std::string& param_name, const bool& default_value, const bool& requires) {
+    auto p = requires ? get_param(param_name) : get_optional_param(param_name);
     if (p.empty()) {
         return default_value;
     }

src/cpp/src/module_genai/pipeline/module_base.hpp

@@ -65,9 +65,6 @@ class IBaseModule {
     std::string get_param(const std::string& param_item);
     std::string get_optional_param(const std::string& param_item);
     size_t str_to_size_t(const std::string& param_item);
-    // Convert string to bool. String "true", "True", "TRUE", "1" will be converted to true, and string "false",
-    // "False", "FALSE", "0" will be converted to false. Other strings will throw an exception.
-    bool str_to_bool(const std::string& param_item);
     static void start_generate() {
         m_generate_start_time = std::chrono::steady_clock::now();
     }
@@ -84,7 +81,7 @@ class IBaseModule {
     bool m_splitted_model = false;
     void check_splitted_model();
 
-    bool check_bool_param(const std::string& param_name, const bool& default_value);
+    bool check_bool_param(const std::string& param_name, const bool& default_value, const bool& requires=false);
 
     // Initialize ov::Model from config models_map with param_name: "ov_model"
     void init_ov_model();