Skip to content

Commit e37c35a

Browse files
committed
[update] melotts & tts supported vlm input.
1 parent 8cf311f commit e37c35a

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

projects/llm_framework/main_melotts/src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ class llm_tts : public StackFlow {
501501
llm_channel->subscriber_work_id(
502502
"", std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
503503
std::placeholders::_2));
504-
} else if (input.find("llm") != std::string::npos) {
504+
} else if ((input.find("llm") != std::string::npos) || (input.find("vlm") != std::string::npos)) {
505505
llm_channel->subscriber_work_id(input,
506506
std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel,
507507
std::placeholders::_1, std::placeholders::_2));
@@ -539,7 +539,7 @@ class llm_tts : public StackFlow {
539539
}
540540
auto llm_channel = get_channel(work_id);
541541
auto llm_task_obj = llm_task_[work_id_num];
542-
if (data.find("llm") != std::string::npos) {
542+
if ((data.find("llm") != std::string::npos) || (data.find("vlm") != std::string::npos)) {
543543
ret = llm_channel->subscriber_work_id(
544544
data, std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
545545
std::placeholders::_2));

projects/llm_framework/main_tts/src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ class llm_tts : public StackFlow {
345345
llm_channel->subscriber_work_id(
346346
"", std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
347347
std::placeholders::_2));
348-
} else if (input.find("llm") != std::string::npos) {
348+
} else if ((input.find("llm") != std::string::npos) || (input.find("vlm") != std::string::npos)) {
349349
llm_channel->subscriber_work_id(input,
350350
std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel,
351351
std::placeholders::_1, std::placeholders::_2));
@@ -383,7 +383,7 @@ class llm_tts : public StackFlow {
383383
}
384384
auto llm_channel = get_channel(work_id);
385385
auto llm_task_obj = llm_task_[work_id_num];
386-
if (data.find("llm") != std::string::npos) {
386+
if ((data.find("llm") != std::string::npos) || (data.find("vlm") != std::string::npos)) {
387387
ret = llm_channel->subscriber_work_id(
388388
data, std::bind(&llm_tts::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
389389
std::placeholders::_2));

projects/llm_framework/main_vlm/src/main.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ class llm_task {
141141
tokenizer_server_flage_ = true;
142142
SLOGI("port_=%s model_id=%s content=%s", std::to_string(port_).c_str(), (base_model + "tokenizer").c_str(), ("'" + prompt_ + "'").c_str());
143143
std::this_thread::sleep_for(std::chrono::seconds(10));
144-
// return -1;
145144
}
146145
} else {
147146
mode_config_.filename_tokenizer_model = base_model + mode_config_.filename_tokenizer_model;

0 commit comments

Comments
 (0)