Skip to content

bugfix: temporarily use heap allocation for VLM backend. #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2025
Merged

bugfix: temporarily use heap allocation for VLM backend. #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions xllm/api_service/api_service.cpp
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ void ChatCompletionsImpl(std::unique_ptr<Service>& service,
return;
}

auto call =
std::make_shared<ChatCall>(ctrl, guard.release(), req_pb, resp_pb);
auto call = std::make_shared<ChatCall>(
ctrl, guard.release(), req_pb, resp_pb, arena != nullptr /*use_arena*/);
service->process_async(call);
}
} // namespace
Expand All @@ -166,17 +166,18 @@ void APIService::ChatCompletionsHttp(
return;
}

auto arena = response->GetArena();
auto ctrl = reinterpret_cast<brpc::Controller*>(controller);

if (FLAGS_backend == "llm") {
auto arena = response->GetArena();
CHECK(chat_service_impl_) << " chat service is invalid.";
ChatCompletionsImpl<ChatCall, ChatServiceImpl>(
chat_service_impl_, done_guard, arena, ctrl);
} else if (FLAGS_backend == "vlm") {
CHECK(mm_chat_service_impl_) << " mm chat service is invalid.";
// TODO: fix me - temporarily using heap allocation instead of arena
ChatCompletionsImpl<MMChatCall, MMChatServiceImpl>(
mm_chat_service_impl_, done_guard, arena, ctrl);
mm_chat_service_impl_, done_guard, nullptr, ctrl);
}
}

Expand Down
14 changes: 12 additions & 2 deletions xllm/api_service/stream_call.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@ class StreamCall : public Call {
StreamCall(brpc::Controller* controller,
::google::protobuf::Closure* done,
Request* request,
Response* response)
: Call(controller), done_(done), request_(request), response_(response) {
Response* response,
bool use_arena = true)
: Call(controller),
done_(done),
request_(request),
response_(response),
use_arena_(use_arena) {
stream_ = request_->stream();
if (stream_) {
pa_ = controller_->CreateProgressiveAttachment();
Expand All @@ -67,6 +72,10 @@ class StreamCall : public Call {
if (!stream_) {
done_->Run();
}
if (!use_arena_) {
delete request_;
delete response_;
}
}

bool write_and_finish(Response& response) {
Expand Down Expand Up @@ -142,6 +151,7 @@ class StreamCall : public Call {
Response* response_;

bool stream_ = false;
bool use_arena_ = true;
butil::intrusive_ptr<brpc::ProgressiveAttachment> pa_;
butil::IOBuf io_buf_;

Expand Down