Skip to content
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.

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

[ Frontend ] Multiprocessing for OpenAI Server with zeromq #6883

Merged
merged 84 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
bed649a
:alembic: add backend proto file
joerunde Jul 25, 2024
7de9d49
:recycle: move proto to grpc/pb
joerunde Jul 25, 2024
9394a62
:sparkles: add proto compilation
joerunde Jul 25, 2024
dd8bf96
updated
robertgshaw2-redhat Jul 25, 2024
5c7fbff
kinda working
robertgshaw2-redhat Jul 25, 2024
952e8ef
:construction: more wip
joerunde Jul 25, 2024
e8eac95
fixed
robertgshaw2-redhat Jul 25, 2024
938a843
:bug: fixup race condition
joerunde Jul 25, 2024
2b8d7cd
:bug: remove timeout
joerunde Jul 25, 2024
ea02d39
format
robertgshaw2-redhat Jul 26, 2024
4a2dc46
streaming
robertgshaw2-redhat Jul 26, 2024
30f2bc9
removed breaks
robertgshaw2-redhat Jul 26, 2024
c718b68
pushing current state
robertgshaw2-redhat Jul 26, 2024
b3d25c6
:alembic: try unix sockets
joerunde Jul 26, 2024
2765b17
:zap: no background loop
joerunde Jul 26, 2024
b219778
spurious change
robertgshaw2-redhat Jul 26, 2024
932ea23
remove spurious change
robertgshaw2-redhat Jul 26, 2024
f029114
spurious changes
robertgshaw2-redhat Jul 26, 2024
6854758
spurioous change
robertgshaw2-redhat Jul 26, 2024
3b5ff66
:bug: whoops
joerunde Jul 26, 2024
79247c3
:memo: log stuff
joerunde Jul 26, 2024
a39ebc0
stash
robertgshaw2-redhat Jul 26, 2024
ef257f1
pushing up
robertgshaw2-redhat Jul 26, 2024
a6c9bc5
stash
robertgshaw2-redhat Jul 28, 2024
d7490bc
actually working
robertgshaw2-redhat Jul 28, 2024
f68fd60
cleanup
robertgshaw2-redhat Jul 28, 2024
38b5b9c
more cleanup
robertgshaw2-redhat Jul 28, 2024
bc54311
cleanup
robertgshaw2-redhat Jul 28, 2024
3cccebb
stash
robertgshaw2-redhat Jul 28, 2024
4b78e29
more cleanup
robertgshaw2-redhat Jul 28, 2024
345bfdd
setup
robertgshaw2-redhat Jul 28, 2024
cfbb001
cleanup
robertgshaw2-redhat Jul 28, 2024
d811b42
format
robertgshaw2-redhat Jul 28, 2024
852534e
cleaning up
robertgshaw2-redhat Jul 28, 2024
e42be96
zlib
robertgshaw2-redhat Jul 28, 2024
5202a59
Revert "zlib"
robertgshaw2-redhat Jul 28, 2024
71b1bf9
turn on chunked prefill
robertgshaw2-redhat Jul 28, 2024
a499079
move RPC code into oai server
robertgshaw2-redhat Jul 29, 2024
88a1d08
format
robertgshaw2-redhat Jul 29, 2024
13ce2f1
format
robertgshaw2-redhat Jul 29, 2024
bb8ac06
trying to flow it through
robertgshaw2-redhat Jul 29, 2024
6ebdb3d
cleaning
robertgshaw2-redhat Jul 29, 2024
24c8100
cleaning
robertgshaw2-redhat Jul 29, 2024
e707049
cleaning
robertgshaw2-redhat Jul 29, 2024
baaf6bc
add stubs
robertgshaw2-redhat Jul 29, 2024
9d19d92
format
robertgshaw2-redhat Jul 29, 2024
f1be4b8
working with single launch...
robertgshaw2-redhat Jul 29, 2024
8e417ad
working end to end - with some hacks
robertgshaw2-redhat Jul 29, 2024
4c16c5e
:goal_net: handle shutdown and request errors
joerunde Jul 29, 2024
6ddd4a7
:art: fmt and clean up shutdown handler
joerunde Jul 29, 2024
6d7da74
:bug: fixup type hint for queue
joerunde Jul 29, 2024
97ea04d
:sparkles: update chat endpoint
joerunde Jul 29, 2024
6d753a4
:bug: fixup zmq constant types
joerunde Jul 29, 2024
38e308e
:sparkles: hook up de/tokenize
joerunde Jul 29, 2024
ec19a7b
:recycle: add VLLMBackend protocol
joerunde Jul 29, 2024
453939b
Frontend mp flag (#384)
joerunde Jul 30, 2024
1f33286
Features / Cleanup for MP Frontend (#387)
robertgshaw2-redhat Jul 31, 2024
5362952
Use random port for backend (#390)
joerunde Jul 31, 2024
7214fb8
Await socket operations + some other minor cleanup (#391)
njhill Jul 31, 2024
98a7dab
:sparkles: health check round 2 (#392)
joerunde Jul 31, 2024
f5f0b45
Add tokenizer (#394)
robertgshaw2-redhat Jul 31, 2024
0b351c0
Socket context (#393)
joerunde Jul 31, 2024
79fcc44
Logit bias (#395)
robertgshaw2-redhat Jul 31, 2024
9da8c4a
Merge remote-tracking branch 'upstream/main' into isolate-oai-server-…
joerunde Jul 31, 2024
4c65f74
:bug: messed up the revert in the merge commit :(
joerunde Jul 31, 2024
9bc97f1
fix (#396)
robertgshaw2-redhat Jul 31, 2024
68d8612
Merge remote-tracking branch 'upstream/main' into isolate-oai-server-…
joerunde Jul 31, 2024
4337fe7
format
robertgshaw2-redhat Aug 1, 2024
779d9bd
stash
robertgshaw2-redhat Aug 1, 2024
a6044a3
Fix failed tests (#398)
robertgshaw2-redhat Aug 1, 2024
100189f
Merge branch 'main' into isolate-oai-server-process
robertgshaw2-redhat Aug 1, 2024
0fc8545
fixed merge conflicts
robertgshaw2-redhat Aug 1, 2024
6383091
updated
robertgshaw2-redhat Aug 1, 2024
a09f57f
cleaning
robertgshaw2-redhat Aug 1, 2024
1bdbfcb
:white_check_mark: add test for multiprocessing flag (#399)
joerunde Aug 1, 2024
f3c0f1c
:sparkles: pipe tracing flag (#400)
joerunde Aug 1, 2024
9c415ad
integration tests for old backend
robertgshaw2-redhat Aug 1, 2024
62036ad
rename
robertgshaw2-redhat Aug 1, 2024
a177d87
cleaning
robertgshaw2-redhat Aug 1, 2024
9ca3b93
ordering
robertgshaw2-redhat Aug 1, 2024
f8b5fb1
fix embedding model feedback
robertgshaw2-redhat Aug 1, 2024
fca5a71
Update vllm/entrypoints/openai/rpc/server.py
robertgshaw2-redhat Aug 1, 2024
5f07f86
format
robertgshaw2-redhat Aug 1, 2024
bd0fd76
Merge branch 'main' into isolate-oai-server-process
robertgshaw2-redhat Aug 2, 2024
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
7 changes: 3 additions & 4 deletions examples/openai_completion_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
model = models.data[0].id

# Completion API
stream = False
stream = True
completion = client.completions.create(
model=model,
prompt="A robot may not injure a human being",
echo=False,
n=2,
stream=stream,
logprobs=3)
n=1,
stream=stream)

print("Completion results:")
if stream:
Expand Down
89 changes: 47 additions & 42 deletions vllm/entrypoints/openai/api_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import re
import signal
from contextlib import asynccontextmanager
from multiprocessing import Process
from http import HTTPStatus
from typing import Optional, Set

Expand All @@ -16,6 +17,8 @@
from prometheus_client import make_asgi_app
from starlette.routing import Mount

from transformers import AutoTokenizer

import vllm.envs as envs
from vllm.engine.arg_utils import AsyncEngineArgs
from vllm.engine.async_llm_engine import AsyncLLMEngine
Expand All @@ -37,8 +40,9 @@
from vllm.entrypoints.openai.serving_embedding import OpenAIServingEmbedding
from vllm.entrypoints.openai.serving_tokenization import (
OpenAIServingTokenization)
from vllm.entrypoints.openai.rpc.client import RPCClient
from vllm.entrypoints.openai.rpc.server import run_rpc_server
from vllm.logger import init_logger
from vllm.usage.usage_lib import UsageContext
from vllm.utils import FlexibleArgumentParser
from vllm.version import __version__ as VLLM_VERSION

Expand All @@ -64,10 +68,10 @@ async def _force_log():
await asyncio.sleep(10)
await engine.do_log_stats()

if not engine_args.disable_log_stats:
task = asyncio.create_task(_force_log())
_running_tasks.add(task)
task.add_done_callback(_running_tasks.remove)
# if not engine_args.disable_log_stats:
# task = asyncio.create_task(_force_log())
# _running_tasks.add(task)
# task.add_done_callback(_running_tasks.remove)

yield

Expand Down Expand Up @@ -216,7 +220,6 @@ async def authentication(request: Request, call_next):

async def build_server(
args,
llm_engine: Optional[AsyncLLMEngine] = None,
**uvicorn_kwargs,
) -> uvicorn.Server:
app = build_app(args)
Expand All @@ -226,14 +229,11 @@ async def build_server(
else:
served_model_names = [args.model]

global engine, engine_args

engine_args = AsyncEngineArgs.from_cli_args(args)
engine = (llm_engine
if llm_engine is not None else AsyncLLMEngine.from_engine_args(
engine_args, usage_context=UsageContext.OPENAI_API_SERVER))

model_config = await engine.get_model_config()
# TODO: figure out a way around passing the token
rpc_client = RPCClient(tokenizer=AutoTokenizer.from_pretrained(args.model))
await rpc_client.wait_for_server()
logger.info("RPC Client connected to RPC server.")
model_config = await rpc_client.get_model_config()

if args.disable_log_requests:
request_logger = None
Expand All @@ -245,40 +245,40 @@ async def build_server(
global openai_serving_embedding
global openai_serving_tokenization

openai_serving_chat = OpenAIServingChat(
engine,
model_config,
served_model_names,
args.response_role,
lora_modules=args.lora_modules,
prompt_adapters=args.prompt_adapters,
request_logger=request_logger,
chat_template=args.chat_template,
return_tokens_as_token_ids=args.return_tokens_as_token_ids,
)
# openai_serving_chat = OpenAIServingChat(
# engine,
# model_config,
# served_model_names,
# args.response_role,
# lora_modules=args.lora_modules,
# prompt_adapters=args.prompt_adapters,
# request_logger=request_logger,
# chat_template=args.chat_template,
# return_tokens_as_token_ids=args.return_tokens_as_token_ids,
# )
openai_serving_completion = OpenAIServingCompletion(
engine,
rpc_client,
model_config,
served_model_names,
lora_modules=args.lora_modules,
prompt_adapters=args.prompt_adapters,
request_logger=request_logger,
return_tokens_as_token_ids=args.return_tokens_as_token_ids,
)
openai_serving_embedding = OpenAIServingEmbedding(
engine,
model_config,
served_model_names,
request_logger=request_logger,
)
openai_serving_tokenization = OpenAIServingTokenization(
engine,
model_config,
served_model_names,
lora_modules=args.lora_modules,
request_logger=request_logger,
chat_template=args.chat_template,
)
# openai_serving_embedding = OpenAIServingEmbedding(
# engine,
# model_config,
# served_model_names,
# request_logger=request_logger,
# )
# openai_serving_tokenization = OpenAIServingTokenization(
# engine,
# model_config,
# served_model_names,
# lora_modules=args.lora_modules,
# request_logger=request_logger,
# chat_template=args.chat_template,
# )
app.root_path = args.root_path

logger.info("Available routes are:")
Expand All @@ -304,13 +304,16 @@ async def build_server(
return uvicorn.Server(config)


async def run_server(args, llm_engine=None, **uvicorn_kwargs) -> None:
async def run_server(args, **uvicorn_kwargs) -> None:
logger.info("vLLM API server version %s", VLLM_VERSION)
logger.info("args: %s", args)

rpc_server_process = Process(target=run_rpc_server,
args=(AsyncEngineArgs.from_cli_args(args), ))
rpc_server_process.start()

server = await build_server(
args,
llm_engine,
**uvicorn_kwargs,
)

Expand All @@ -327,9 +330,11 @@ def signal_handler() -> None:

try:
await server_task
rpc_server_process.join()
except asyncio.CancelledError:
print("Gracefully stopping http server")
await server.shutdown()
rpc_server_process.join()


if __name__ == "__main__":
Expand Down
26 changes: 26 additions & 0 deletions vllm/entrypoints/openai/rpc/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from dataclasses import dataclass
from typing import Optional, Mapping
from enum import Enum

from vllm.inputs import PromptInputs
from vllm.lora.request import LoRARequest
from vllm.prompt_adapter.request import PromptAdapterRequest
from vllm.sampling_params import SamplingParams

VLLM_GENERATE_RPC_PATH = "tcp://localhost:5570"
VLLM_GET_DATA_RPC_PATH = "tcp://localhost:5571"
VLLM_IS_READY_RPC_PATH = "tcp://localhost:5572"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the very least we should be choosing randomly available ports above the "user space" of the 1000s port range. See https://pyzmq.readthedocs.io/en/latest/api/zmq.html#zmq.Socket.bind_to_random_port

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgoin yeah that'd be better. Any idea how we'd notify the clients what port to connect to in that case?

The server that would be calling .bind_to_random_port() is in a different process than the openai server that needs to connect clients to it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the the openai server can listen first, pass the ports to the server process, and then the server just connects to it?



@dataclass
class GenerateRequest:
inputs: PromptInputs
sampling_params: SamplingParams
request_id: str
lora_request: Optional[LoRARequest] = None
trace_headers: Optional[Mapping[str, str]] = None
prompt_adapter_request: Optional[PromptAdapterRequest] = None


class GetDataRequest(Enum):
MODEL_CONFIG = 1
98 changes: 98 additions & 0 deletions vllm/entrypoints/openai/rpc/client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
from typing import AsyncIterator, Optional, Mapping

from vllm.config import ModelConfig, DecodingConfig
from vllm.inputs import PromptInputs
from vllm.lora.request import LoRARequest
from vllm.outputs import RequestOutput
from vllm.prompt_adapter.request import PromptAdapterRequest
from vllm.sampling_params import SamplingParams
from vllm.entrypoints.openai.rpc import (VLLM_GENERATE_RPC_PATH,
VLLM_GET_DATA_RPC_PATH,
VLLM_IS_READY_RPC_PATH,
GenerateRequest, GetDataRequest)

import zmq
import zmq.asyncio
import pickle


class RPCClient:

# TODO: check if opening all these sockets is an antipattern?
def __init__(self, tokenizer):
self.context = zmq.asyncio.Context()

# TODO: do the tokenizer properly.
self.tokenizer = tokenizer
self.decoding_config = DecodingConfig()

# Socket to check if the RPC server is ready.
self.is_ready_socket = self.context.socket(zmq.REP)
self.is_ready_socket.connect(VLLM_IS_READY_RPC_PATH)

# Socket to query data (e.g. get_model_config)
self.get_data_socket = self.context.socket(zmq.REQ)
self.get_data_socket.connect(VLLM_GET_DATA_RPC_PATH)

async def wait_for_server(self):
await self.is_ready_socket.recv()

async def get_model_config(self) -> ModelConfig:
self.get_data_socket.send(pickle.dumps(GetDataRequest.MODEL_CONFIG))
model_config = await self.get_data_socket.recv()
return pickle.loads(model_config)

async def get_tokenizer(self, lora_request: LoRARequest):
# TODO: handle this via get data? - or avoid doing via RPC
return self.tokenizer

async def get_decoding_config(self):
# TODO: handle this via get data? - or avoid doing via RPC
return self.decoding_config

async def abort(self, request_id: str):
# TODO: actually handle this with a new socket.
pass

async def is_tracing_enabled(self):
return False

async def generate(
self,
inputs: PromptInputs,
sampling_params: SamplingParams,
request_id: str,
lora_request: Optional[LoRARequest] = None,
trace_headers: Optional[Mapping[str, str]] = None,
prompt_adapter_request: Optional[PromptAdapterRequest] = None
) -> AsyncIterator[RequestOutput]:

# Connect to RPC socket for Request-Reply pattern,
# Note that we use DEALER to enable asynchronous communication
# to enable streaming.
socket = self.context.socket(zmq.DEALER)
socket.connect(VLLM_GENERATE_RPC_PATH)

# Send GenerateRequest to the RPC Server.
await socket.send_multipart([
pickle.dumps(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As @robertgshaw2-neuralmagic suggested, let's use msgspec?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's separate the messaging protocol optimizations to a separate PR

GenerateRequest(inputs=inputs,
sampling_params=sampling_params,
request_id=request_id,
lora_request=lora_request,
trace_headers=trace_headers,
prompt_adapter_request=prompt_adapter_request),
pickle.HIGHEST_PROTOCOL)
])

# Stream back the results from the RPC Server.
while True:
message = await socket.recv()
request_output = pickle.loads(message)

if request_output.finished:
break
yield request_output

socket.close()
yield request_output
Loading