From 9761b9ed2dc488915d2975ffd16abc83d91962b6 Mon Sep 17 00:00:00 2001 From: shuaills Date: Mon, 23 Dec 2024 15:36:52 +0000 Subject: [PATCH 1/3] fix Outlines version error --- python/pyproject.toml | 2 +- python/sglang/srt/constrained/outlines_backend.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index d459c523f10..602929d4eaa 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -23,7 +23,7 @@ runtime_common = ["aiohttp", "decord", "fastapi", "psutil", "pydantic", "python-multipart", "pyzmq>=25.1.2", "torchao>=0.7.0", "gemlite", "uvicorn", "uvloop", "xgrammar>=0.1.6"] -srt = ["sglang[runtime_common]", "torch", "vllm>=0.6.3.post1,<=0.6.4.post1", "cuda-python", "flashinfer==0.1.6"] +srt = ["sglang[runtime_common]", "torch", "vllm==0.6.5", "cuda-python", "flashinfer==0.1.6"] # HIP (Heterogeneous-computing Interface for Portability) for AMD # => base docker rocm/vllm-dev:20241022, not from public vllm whl diff --git a/python/sglang/srt/constrained/outlines_backend.py b/python/sglang/srt/constrained/outlines_backend.py index 4820d473959..147d0f029a6 100644 --- a/python/sglang/srt/constrained/outlines_backend.py +++ b/python/sglang/srt/constrained/outlines_backend.py @@ -20,8 +20,8 @@ import interegular import torch from outlines.fsm.guide import RegexGuide -from outlines.fsm.json_schema import build_regex_from_schema from outlines.models.transformers import TransformerTokenizer +from outlines_core.fsm.json_schema import build_regex_from_schema from pydantic import BaseModel from sglang.srt.constrained.base_grammar_backend import ( From 318e88ea4eea486d5f20a2ec833aceb04ce0cc6f Mon Sep 17 00:00:00 2001 From: shuaills Date: Mon, 23 Dec 2024 15:49:46 +0000 Subject: [PATCH 2/3] deps: update outlines requirement to ==0.1.11 --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 602929d4eaa..fdcc88919b1 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -18,7 +18,7 @@ dependencies = ["requests", "tqdm", "numpy", "IPython", "setproctitle"] [project.optional-dependencies] runtime_common = ["aiohttp", "decord", "fastapi", "hf_transfer", "huggingface_hub", "interegular", "modelscope", - "orjson", "outlines>=0.0.44,<0.1.0", + "orjson", "outlines==0.1.11", "packaging", "pillow", "prometheus-client>=0.20.0", "psutil", "pydantic", "python-multipart", "pyzmq>=25.1.2", "torchao>=0.7.0", "gemlite", "uvicorn", "uvloop", From 6f9298e607dadfb68e23d85a85dc81d6c1eb404b Mon Sep 17 00:00:00 2001 From: shuaills Date: Mon, 23 Dec 2024 19:03:13 +0000 Subject: [PATCH 3/3] fix vllm version --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index fdcc88919b1..05d5590cfa1 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -23,7 +23,7 @@ runtime_common = ["aiohttp", "decord", "fastapi", "psutil", "pydantic", "python-multipart", "pyzmq>=25.1.2", "torchao>=0.7.0", "gemlite", "uvicorn", "uvloop", "xgrammar>=0.1.6"] -srt = ["sglang[runtime_common]", "torch", "vllm==0.6.5", "cuda-python", "flashinfer==0.1.6"] +srt = ["sglang[runtime_common]", "torch", "vllm>=0.6.3.post1,<=0.6.4.post1", "cuda-python", "flashinfer==0.1.6"] # HIP (Heterogeneous-computing Interface for Portability) for AMD # => base docker rocm/vllm-dev:20241022, not from public vllm whl