diff --git a/projects/llm_framework/main_melotts/src/main.cpp b/projects/llm_framework/main_melotts/src/main.cpp index 09eb4bc..f90be2f 100644 --- a/projects/llm_framework/main_melotts/src/main.cpp +++ b/projects/llm_framework/main_melotts/src/main.cpp @@ -501,7 +501,7 @@ class llm_tts : public StackFlow { llm_channel->subscriber_work_id( "", std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1, std::placeholders::_2)); - } else if (input.find("llm") != std::string::npos) { + } else if ((input.find("llm") != std::string::npos) || (input.find("vlm") != std::string::npos)) { llm_channel->subscriber_work_id(input, std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1, std::placeholders::_2)); @@ -539,7 +539,7 @@ class llm_tts : public StackFlow { } auto llm_channel = get_channel(work_id); auto llm_task_obj = llm_task_[work_id_num]; - if (data.find("llm") != std::string::npos) { + if ((data.find("llm") != std::string::npos) || (data.find("vlm") != std::string::npos)) { ret = llm_channel->subscriber_work_id( data, std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1, std::placeholders::_2)); diff --git a/projects/llm_framework/main_tts/src/main.cpp b/projects/llm_framework/main_tts/src/main.cpp index db02627..93d8282 100644 --- a/projects/llm_framework/main_tts/src/main.cpp +++ b/projects/llm_framework/main_tts/src/main.cpp @@ -345,7 +345,7 @@ class llm_tts : public StackFlow { llm_channel->subscriber_work_id( "", std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1, std::placeholders::_2)); - } else if (input.find("llm") != std::string::npos) { + } else if ((input.find("llm") != std::string::npos) || (input.find("vlm") != std::string::npos)) { llm_channel->subscriber_work_id(input, std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1, std::placeholders::_2)); @@ -383,7 +383,7 @@ class llm_tts : public StackFlow { } auto llm_channel = get_channel(work_id); auto llm_task_obj = llm_task_[work_id_num]; - if (data.find("llm") != std::string::npos) { + if ((data.find("llm") != std::string::npos) || (data.find("vlm") != std::string::npos)) { ret = llm_channel->subscriber_work_id( data, std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1, std::placeholders::_2)); diff --git a/projects/llm_framework/main_vlm/src/main.cpp b/projects/llm_framework/main_vlm/src/main.cpp index 5eedb56..83596f1 100644 --- a/projects/llm_framework/main_vlm/src/main.cpp +++ b/projects/llm_framework/main_vlm/src/main.cpp @@ -141,7 +141,6 @@ class llm_task { tokenizer_server_flage_ = true; SLOGI("port_=%s model_id=%s content=%s", std::to_string(port_).c_str(), (base_model + "tokenizer").c_str(), ("'" + prompt_ + "'").c_str()); std::this_thread::sleep_for(std::chrono::seconds(10)); - // return -1; } } else { mode_config_.filename_tokenizer_model = base_model + mode_config_.filename_tokenizer_model;