e489ad7a21
- **Add SPDX license headers to python source files**
- **Check for SPDX headers using pre-commit**
commit 9d7ef44c3cfb72ca4c32e1c677d99259d10d4745
Author: Russell Bryant <rbryant@redhat.com>
Date: Fri Jan 31 14:18:24 2025 -0500
Add SPDX license headers to python source files
This commit adds SPDX license headers to python source files as
recommended to
the project by the Linux Foundation. These headers provide a concise way
that is
both human and machine readable for communicating license information
for each
source file. It helps avoid any ambiguity about the license of the code
and can
also be easily used by tools to help manage license compliance.
The Linux Foundation runs license scans against the codebase to help
ensure
we are in compliance with the licenses of the code we use, including
dependencies. Having these headers in place helps that tool do its job.
More information can be found on the SPDX site:
- https://spdx.dev/learn/handling-license-info/
Signed-off-by: Russell Bryant <rbryant@redhat.com>
commit 5a1cf1cb3b80759131c73f6a9dddebccac039dea
Author: Russell Bryant <rbryant@redhat.com>
Date: Fri Jan 31 14:36:32 2025 -0500
Check for SPDX headers using pre-commit
Signed-off-by: Russell Bryant <rbryant@redhat.com>
---------
Signed-off-by: Russell Bryant <rbryant@redhat.com>
92 lines
2.7 KiB
Python
92 lines
2.7 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
import asyncio
|
|
import os
|
|
from typing import Any, Callable, Dict, List, Optional, Tuple, Union
|
|
|
|
import pytest
|
|
|
|
from vllm.engine.arg_utils import AsyncEngineArgs, EngineArgs
|
|
from vllm.engine.async_llm_engine import AsyncLLMEngine
|
|
from vllm.engine.llm_engine import LLMEngine
|
|
from vllm.executor.uniproc_executor import UniProcExecutor
|
|
from vllm.sampling_params import SamplingParams
|
|
|
|
|
|
class Mock:
|
|
...
|
|
|
|
|
|
class CustomUniExecutor(UniProcExecutor):
|
|
|
|
def collective_rpc(self,
|
|
method: Union[str, Callable],
|
|
timeout: Optional[float] = None,
|
|
args: Tuple = (),
|
|
kwargs: Optional[Dict] = None) -> List[Any]:
|
|
# Drop marker to show that this was ran
|
|
with open(".marker", "w"):
|
|
...
|
|
return super().collective_rpc(method, timeout, args, kwargs)
|
|
|
|
|
|
CustomUniExecutorAsync = CustomUniExecutor
|
|
|
|
|
|
@pytest.mark.parametrize("model", ["facebook/opt-125m"])
|
|
def test_custom_executor_type_checking(model):
|
|
with pytest.raises(ValueError):
|
|
engine_args = EngineArgs(model=model,
|
|
distributed_executor_backend=Mock)
|
|
LLMEngine.from_engine_args(engine_args)
|
|
with pytest.raises(ValueError):
|
|
engine_args = AsyncEngineArgs(model=model,
|
|
distributed_executor_backend=Mock)
|
|
AsyncLLMEngine.from_engine_args(engine_args)
|
|
|
|
|
|
@pytest.mark.parametrize("model", ["facebook/opt-125m"])
|
|
def test_custom_executor(model, tmp_path):
|
|
cwd = os.path.abspath(".")
|
|
os.chdir(tmp_path)
|
|
try:
|
|
assert not os.path.exists(".marker")
|
|
|
|
engine_args = EngineArgs(
|
|
model=model,
|
|
distributed_executor_backend=CustomUniExecutor,
|
|
)
|
|
engine = LLMEngine.from_engine_args(engine_args)
|
|
sampling_params = SamplingParams(max_tokens=1)
|
|
|
|
engine.add_request("0", "foo", sampling_params)
|
|
engine.step()
|
|
|
|
assert os.path.exists(".marker")
|
|
finally:
|
|
os.chdir(cwd)
|
|
|
|
|
|
@pytest.mark.parametrize("model", ["facebook/opt-125m"])
|
|
def test_custom_executor_async(model, tmp_path):
|
|
cwd = os.path.abspath(".")
|
|
os.chdir(tmp_path)
|
|
try:
|
|
assert not os.path.exists(".marker")
|
|
|
|
engine_args = AsyncEngineArgs(
|
|
model=model, distributed_executor_backend=CustomUniExecutorAsync)
|
|
engine = AsyncLLMEngine.from_engine_args(engine_args)
|
|
sampling_params = SamplingParams(max_tokens=1)
|
|
|
|
async def t():
|
|
stream = await engine.add_request("0", "foo", sampling_params)
|
|
async for x in stream:
|
|
...
|
|
|
|
asyncio.run(t())
|
|
|
|
assert os.path.exists(".marker")
|
|
finally:
|
|
os.chdir(cwd)
|