2023-05-16 15:23:27 -06:00
|
|
|
import sys
|
2023-05-15 15:36:30 -06:00
|
|
|
import subprocess
|
|
|
|
import contextlib
|
|
|
|
import pytest
|
|
|
|
import asyncio
|
|
|
|
import os
|
|
|
|
import docker
|
2023-05-16 12:22:11 -06:00
|
|
|
import json
|
|
|
|
import math
|
2024-05-28 01:25:14 -06:00
|
|
|
import shutil
|
|
|
|
import tempfile
|
2023-05-16 12:22:11 -06:00
|
|
|
import time
|
2023-05-16 15:23:27 -06:00
|
|
|
import random
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
from docker.errors import NotFound
|
2023-05-16 12:22:11 -06:00
|
|
|
from typing import Optional, List, Dict
|
|
|
|
from syrupy.extensions.json import JSONSnapshotExtension
|
|
|
|
from aiohttp import ClientConnectorError, ClientOSError, ServerDisconnectedError
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
from text_generation import AsyncClient
|
2024-02-15 02:28:10 -07:00
|
|
|
from text_generation.types import (
|
|
|
|
Response,
|
|
|
|
Details,
|
|
|
|
InputToken,
|
|
|
|
Token,
|
|
|
|
BestOfSequence,
|
|
|
|
Grammar,
|
2024-02-28 03:10:27 -07:00
|
|
|
ChatComplete,
|
|
|
|
ChatCompletionChunk,
|
2024-03-21 10:45:56 -06:00
|
|
|
ChatCompletionComplete,
|
2024-04-17 02:41:12 -06:00
|
|
|
Completion,
|
2024-02-15 02:28:10 -07:00
|
|
|
)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
DOCKER_IMAGE = os.getenv("DOCKER_IMAGE", None)
|
|
|
|
HUGGING_FACE_HUB_TOKEN = os.getenv("HUGGING_FACE_HUB_TOKEN", None)
|
|
|
|
DOCKER_VOLUME = os.getenv("DOCKER_VOLUME", "/data")
|
|
|
|
|
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
class ResponseComparator(JSONSnapshotExtension):
|
2023-11-28 13:22:35 -07:00
|
|
|
rtol = 0.2
|
2023-12-11 06:49:52 -07:00
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
def serialize(
|
|
|
|
self,
|
|
|
|
data,
|
|
|
|
*,
|
|
|
|
exclude=None,
|
|
|
|
matcher=None,
|
|
|
|
):
|
2024-03-21 10:45:56 -06:00
|
|
|
if (
|
|
|
|
isinstance(data, Response)
|
|
|
|
or isinstance(data, ChatComplete)
|
|
|
|
or isinstance(data, ChatCompletionChunk)
|
|
|
|
or isinstance(data, ChatCompletionComplete)
|
|
|
|
):
|
|
|
|
data = data.model_dump()
|
2024-02-21 06:15:22 -07:00
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
if isinstance(data, List):
|
2024-03-21 10:45:56 -06:00
|
|
|
data = [d.model_dump() for d in data]
|
2023-05-16 12:22:11 -06:00
|
|
|
|
|
|
|
data = self._filter(
|
|
|
|
data=data, depth=0, path=(), exclude=exclude, matcher=matcher
|
|
|
|
)
|
|
|
|
return json.dumps(data, indent=2, ensure_ascii=False, sort_keys=False) + "\n"
|
|
|
|
|
|
|
|
def matches(
|
|
|
|
self,
|
|
|
|
*,
|
|
|
|
serialized_data,
|
|
|
|
snapshot_data,
|
|
|
|
) -> bool:
|
|
|
|
def convert_data(data):
|
|
|
|
data = json.loads(data)
|
2024-02-28 03:10:27 -07:00
|
|
|
if isinstance(data, Dict) and "choices" in data:
|
|
|
|
choices = data["choices"]
|
2024-04-17 02:41:12 -06:00
|
|
|
if isinstance(choices, List) and len(choices) >= 1:
|
|
|
|
if "delta" in choices[0]:
|
|
|
|
return ChatCompletionChunk(**data)
|
|
|
|
if "text" in choices[0]:
|
|
|
|
return Completion(**data)
|
2024-02-28 03:10:27 -07:00
|
|
|
return ChatComplete(**data)
|
2023-05-16 12:22:11 -06:00
|
|
|
|
|
|
|
if isinstance(data, Dict):
|
|
|
|
return Response(**data)
|
|
|
|
if isinstance(data, List):
|
2024-04-17 02:41:12 -06:00
|
|
|
if (
|
|
|
|
len(data) > 0
|
|
|
|
and "object" in data[0]
|
|
|
|
and data[0]["object"] == "text_completion"
|
|
|
|
):
|
|
|
|
return [Completion(**d) for d in data]
|
2023-05-16 12:22:11 -06:00
|
|
|
return [Response(**d) for d in data]
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def eq_token(token: Token, other: Token) -> bool:
|
|
|
|
return (
|
|
|
|
token.id == other.id
|
|
|
|
and token.text == other.text
|
2023-11-28 13:22:35 -07:00
|
|
|
and math.isclose(token.logprob, other.logprob, rel_tol=self.rtol)
|
2023-05-16 12:22:11 -06:00
|
|
|
and token.special == other.special
|
|
|
|
)
|
|
|
|
|
2023-06-02 09:12:30 -06:00
|
|
|
def eq_prefill_token(prefill_token: InputToken, other: InputToken) -> bool:
|
2023-05-16 12:22:11 -06:00
|
|
|
try:
|
|
|
|
return (
|
|
|
|
prefill_token.id == other.id
|
|
|
|
and prefill_token.text == other.text
|
|
|
|
and (
|
2023-12-11 06:49:52 -07:00
|
|
|
math.isclose(
|
|
|
|
prefill_token.logprob, other.logprob, rel_tol=self.rtol
|
|
|
|
)
|
2023-05-16 12:22:11 -06:00
|
|
|
if prefill_token.logprob is not None
|
|
|
|
else prefill_token.logprob == other.logprob
|
|
|
|
)
|
|
|
|
)
|
|
|
|
except TypeError:
|
|
|
|
return False
|
|
|
|
|
|
|
|
def eq_best_of(details: BestOfSequence, other: BestOfSequence) -> bool:
|
|
|
|
return (
|
|
|
|
details.finish_reason == other.finish_reason
|
|
|
|
and details.generated_tokens == other.generated_tokens
|
|
|
|
and details.seed == other.seed
|
|
|
|
and len(details.prefill) == len(other.prefill)
|
|
|
|
and all(
|
|
|
|
[
|
|
|
|
eq_prefill_token(d, o)
|
|
|
|
for d, o in zip(details.prefill, other.prefill)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
and len(details.tokens) == len(other.tokens)
|
|
|
|
and all([eq_token(d, o) for d, o in zip(details.tokens, other.tokens)])
|
|
|
|
)
|
|
|
|
|
|
|
|
def eq_details(details: Details, other: Details) -> bool:
|
|
|
|
return (
|
|
|
|
details.finish_reason == other.finish_reason
|
|
|
|
and details.generated_tokens == other.generated_tokens
|
|
|
|
and details.seed == other.seed
|
|
|
|
and len(details.prefill) == len(other.prefill)
|
|
|
|
and all(
|
|
|
|
[
|
|
|
|
eq_prefill_token(d, o)
|
|
|
|
for d, o in zip(details.prefill, other.prefill)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
and len(details.tokens) == len(other.tokens)
|
|
|
|
and all([eq_token(d, o) for d, o in zip(details.tokens, other.tokens)])
|
|
|
|
and (
|
|
|
|
len(details.best_of_sequences)
|
|
|
|
if details.best_of_sequences is not None
|
|
|
|
else 0
|
|
|
|
)
|
|
|
|
== (
|
|
|
|
len(other.best_of_sequences)
|
|
|
|
if other.best_of_sequences is not None
|
|
|
|
else 0
|
|
|
|
)
|
|
|
|
and (
|
|
|
|
all(
|
|
|
|
[
|
|
|
|
eq_best_of(d, o)
|
|
|
|
for d, o in zip(
|
|
|
|
details.best_of_sequences, other.best_of_sequences
|
|
|
|
)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
if details.best_of_sequences is not None
|
|
|
|
else details.best_of_sequences == other.best_of_sequences
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
2024-04-17 02:41:12 -06:00
|
|
|
def eq_completion(response: Completion, other: Completion) -> bool:
|
|
|
|
return response.choices[0].text == other.choices[0].text
|
|
|
|
|
2024-02-28 03:10:27 -07:00
|
|
|
def eq_chat_complete(response: ChatComplete, other: ChatComplete) -> bool:
|
|
|
|
return (
|
|
|
|
response.choices[0].message.content == other.choices[0].message.content
|
|
|
|
)
|
|
|
|
|
|
|
|
def eq_chat_complete_chunk(
|
|
|
|
response: ChatCompletionChunk, other: ChatCompletionChunk
|
|
|
|
) -> bool:
|
|
|
|
return response.choices[0].delta.content == other.choices[0].delta.content
|
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
def eq_response(response: Response, other: Response) -> bool:
|
|
|
|
return response.generated_text == other.generated_text and eq_details(
|
|
|
|
response.details, other.details
|
|
|
|
)
|
|
|
|
|
|
|
|
serialized_data = convert_data(serialized_data)
|
|
|
|
snapshot_data = convert_data(snapshot_data)
|
|
|
|
|
|
|
|
if not isinstance(serialized_data, List):
|
|
|
|
serialized_data = [serialized_data]
|
|
|
|
if not isinstance(snapshot_data, List):
|
|
|
|
snapshot_data = [snapshot_data]
|
|
|
|
|
2024-04-17 02:41:12 -06:00
|
|
|
if isinstance(serialized_data[0], Completion):
|
|
|
|
return len(snapshot_data) == len(serialized_data) and all(
|
|
|
|
[eq_completion(r, o) for r, o in zip(serialized_data, snapshot_data)]
|
|
|
|
)
|
|
|
|
|
2024-02-28 03:10:27 -07:00
|
|
|
if isinstance(serialized_data[0], ChatComplete):
|
|
|
|
return len(snapshot_data) == len(serialized_data) and all(
|
|
|
|
[eq_chat_complete(r, o) for r, o in zip(serialized_data, snapshot_data)]
|
|
|
|
)
|
|
|
|
|
|
|
|
if isinstance(serialized_data[0], ChatCompletionChunk):
|
|
|
|
return len(snapshot_data) == len(serialized_data) and all(
|
|
|
|
[
|
|
|
|
eq_chat_complete_chunk(r, o)
|
|
|
|
for r, o in zip(serialized_data, snapshot_data)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
return len(snapshot_data) == len(serialized_data) and all(
|
|
|
|
[eq_response(r, o) for r, o in zip(serialized_data, snapshot_data)]
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2023-11-28 13:22:35 -07:00
|
|
|
class GenerousResponseComparator(ResponseComparator):
|
|
|
|
# Needed for GPTQ with exllama which has serious numerical fluctuations.
|
|
|
|
rtol = 0.75
|
|
|
|
|
2023-12-11 06:49:52 -07:00
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
class LauncherHandle:
|
|
|
|
def __init__(self, port: int):
|
|
|
|
self.client = AsyncClient(f"http://localhost:{port}")
|
|
|
|
|
|
|
|
def _inner_health(self):
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
async def health(self, timeout: int = 60):
|
|
|
|
assert timeout > 0
|
|
|
|
for _ in range(timeout):
|
|
|
|
if not self._inner_health():
|
|
|
|
raise RuntimeError("Launcher crashed")
|
|
|
|
|
|
|
|
try:
|
|
|
|
await self.client.generate("test")
|
|
|
|
return
|
|
|
|
except (ClientConnectorError, ClientOSError, ServerDisconnectedError) as e:
|
|
|
|
time.sleep(1)
|
|
|
|
raise RuntimeError("Health check failed")
|
|
|
|
|
|
|
|
|
|
|
|
class ContainerLauncherHandle(LauncherHandle):
|
|
|
|
def __init__(self, docker_client, container_name, port: int):
|
|
|
|
super(ContainerLauncherHandle, self).__init__(port)
|
|
|
|
self.docker_client = docker_client
|
|
|
|
self.container_name = container_name
|
|
|
|
|
|
|
|
def _inner_health(self) -> bool:
|
|
|
|
container = self.docker_client.containers.get(self.container_name)
|
|
|
|
return container.status in ["running", "created"]
|
|
|
|
|
|
|
|
|
|
|
|
class ProcessLauncherHandle(LauncherHandle):
|
|
|
|
def __init__(self, process, port: int):
|
|
|
|
super(ProcessLauncherHandle, self).__init__(port)
|
|
|
|
self.process = process
|
|
|
|
|
|
|
|
def _inner_health(self) -> bool:
|
|
|
|
return self.process.poll() is None
|
|
|
|
|
|
|
|
|
2023-05-15 15:36:30 -06:00
|
|
|
@pytest.fixture
|
2023-05-16 12:22:11 -06:00
|
|
|
def response_snapshot(snapshot):
|
|
|
|
return snapshot.use_extension(ResponseComparator)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
2023-12-11 06:49:52 -07:00
|
|
|
|
2023-11-28 13:22:35 -07:00
|
|
|
@pytest.fixture
|
|
|
|
def generous_response_snapshot(snapshot):
|
|
|
|
return snapshot.use_extension(GenerousResponseComparator)
|
|
|
|
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
|
|
def event_loop():
|
|
|
|
loop = asyncio.get_event_loop()
|
|
|
|
yield loop
|
|
|
|
loop.close()
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
|
|
def launcher(event_loop):
|
|
|
|
@contextlib.contextmanager
|
|
|
|
def local_launcher(
|
2023-05-30 10:25:19 -06:00
|
|
|
model_id: str,
|
|
|
|
num_shard: Optional[int] = None,
|
|
|
|
quantize: Optional[str] = None,
|
|
|
|
trust_remote_code: bool = False,
|
2023-06-08 06:51:52 -06:00
|
|
|
use_flash_attention: bool = True,
|
2024-02-15 02:28:10 -07:00
|
|
|
disable_grammar_support: bool = False,
|
2023-12-11 06:49:52 -07:00
|
|
|
dtype: Optional[str] = None,
|
2024-02-26 11:49:28 -07:00
|
|
|
revision: Optional[str] = None,
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
max_input_length: Optional[int] = None,
|
2024-04-23 15:04:44 -06:00
|
|
|
max_batch_prefill_tokens: Optional[int] = None,
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
max_total_tokens: Optional[int] = None,
|
2023-05-15 15:36:30 -06:00
|
|
|
):
|
2023-05-16 15:23:27 -06:00
|
|
|
port = random.randint(8000, 10_000)
|
|
|
|
master_port = random.randint(10_000, 20_000)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
2023-05-16 15:23:27 -06:00
|
|
|
shard_uds_path = (
|
|
|
|
f"/tmp/tgi-tests-{model_id.split('/')[-1]}-{num_shard}-{quantize}-server"
|
|
|
|
)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
args = [
|
|
|
|
"text-generation-launcher",
|
|
|
|
"--model-id",
|
|
|
|
model_id,
|
|
|
|
"--port",
|
|
|
|
str(port),
|
|
|
|
"--master-port",
|
|
|
|
str(master_port),
|
|
|
|
"--shard-uds-path",
|
|
|
|
shard_uds_path,
|
|
|
|
]
|
|
|
|
|
2023-07-21 02:59:00 -06:00
|
|
|
env = os.environ
|
|
|
|
|
2024-02-15 02:28:10 -07:00
|
|
|
if disable_grammar_support:
|
|
|
|
args.append("--disable-grammar-support")
|
2023-05-15 15:36:30 -06:00
|
|
|
if num_shard is not None:
|
|
|
|
args.extend(["--num-shard", str(num_shard)])
|
2023-07-21 02:59:00 -06:00
|
|
|
if quantize is not None:
|
2023-05-15 15:36:30 -06:00
|
|
|
args.append("--quantize")
|
2023-07-21 02:59:00 -06:00
|
|
|
args.append(quantize)
|
2023-11-28 09:54:26 -07:00
|
|
|
if dtype is not None:
|
|
|
|
args.append("--dtype")
|
|
|
|
args.append(dtype)
|
2024-02-26 11:49:28 -07:00
|
|
|
if revision is not None:
|
|
|
|
args.append("--revision")
|
|
|
|
args.append(revision)
|
2023-05-30 10:25:19 -06:00
|
|
|
if trust_remote_code:
|
|
|
|
args.append("--trust-remote-code")
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
if max_input_length:
|
|
|
|
args.append("--max-input-length")
|
|
|
|
args.append(str(max_input_length))
|
2024-04-23 15:04:44 -06:00
|
|
|
if max_batch_prefill_tokens:
|
|
|
|
args.append("--max-batch-prefill-tokens")
|
|
|
|
args.append(str(max_batch_prefill_tokens))
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
if max_total_tokens:
|
|
|
|
args.append("--max-total-tokens")
|
|
|
|
args.append(str(max_total_tokens))
|
2023-05-15 15:36:30 -06:00
|
|
|
|
2023-05-23 12:47:37 -06:00
|
|
|
env["LOG_LEVEL"] = "info,text_generation_router=debug"
|
|
|
|
|
2023-06-08 06:51:52 -06:00
|
|
|
if not use_flash_attention:
|
|
|
|
env["USE_FLASH_ATTENTION"] = "false"
|
|
|
|
|
2024-05-28 01:25:14 -06:00
|
|
|
with tempfile.TemporaryFile("w+") as tmp:
|
|
|
|
# We'll output stdout/stderr to a temporary file. Using a pipe
|
|
|
|
# cause the process to block until stdout is read.
|
|
|
|
with subprocess.Popen(
|
|
|
|
args,
|
|
|
|
stdout=tmp,
|
|
|
|
stderr=subprocess.STDOUT,
|
|
|
|
env=env,
|
|
|
|
) as process:
|
|
|
|
yield ProcessLauncherHandle(process, port)
|
|
|
|
|
|
|
|
process.terminate()
|
|
|
|
process.wait(60)
|
|
|
|
|
|
|
|
tmp.seek(0)
|
|
|
|
shutil.copyfileobj(tmp, sys.stderr)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
2023-06-08 06:51:52 -06:00
|
|
|
if not use_flash_attention:
|
|
|
|
del env["USE_FLASH_ATTENTION"]
|
|
|
|
|
2023-05-15 15:36:30 -06:00
|
|
|
@contextlib.contextmanager
|
|
|
|
def docker_launcher(
|
2023-05-30 10:25:19 -06:00
|
|
|
model_id: str,
|
|
|
|
num_shard: Optional[int] = None,
|
|
|
|
quantize: Optional[str] = None,
|
|
|
|
trust_remote_code: bool = False,
|
2023-06-08 06:51:52 -06:00
|
|
|
use_flash_attention: bool = True,
|
2024-02-15 02:28:10 -07:00
|
|
|
disable_grammar_support: bool = False,
|
2023-12-11 06:49:52 -07:00
|
|
|
dtype: Optional[str] = None,
|
2024-02-26 11:49:28 -07:00
|
|
|
revision: Optional[str] = None,
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
max_input_length: Optional[int] = None,
|
2024-04-23 15:04:44 -06:00
|
|
|
max_batch_prefill_tokens: Optional[int] = None,
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
max_total_tokens: Optional[int] = None,
|
2023-05-15 15:36:30 -06:00
|
|
|
):
|
2023-05-16 15:23:27 -06:00
|
|
|
port = random.randint(8000, 10_000)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
args = ["--model-id", model_id, "--env"]
|
|
|
|
|
2024-02-15 02:28:10 -07:00
|
|
|
if disable_grammar_support:
|
|
|
|
args.append("--disable-grammar-support")
|
2023-05-15 15:36:30 -06:00
|
|
|
if num_shard is not None:
|
|
|
|
args.extend(["--num-shard", str(num_shard)])
|
2023-07-21 02:59:00 -06:00
|
|
|
if quantize is not None:
|
2023-05-15 15:36:30 -06:00
|
|
|
args.append("--quantize")
|
2023-07-21 02:59:00 -06:00
|
|
|
args.append(quantize)
|
2023-11-28 09:54:26 -07:00
|
|
|
if dtype is not None:
|
|
|
|
args.append("--dtype")
|
|
|
|
args.append(dtype)
|
2024-02-26 11:49:28 -07:00
|
|
|
if revision is not None:
|
|
|
|
args.append("--revision")
|
|
|
|
args.append(revision)
|
2023-05-30 10:25:19 -06:00
|
|
|
if trust_remote_code:
|
|
|
|
args.append("--trust-remote-code")
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
if max_input_length:
|
|
|
|
args.append("--max-input-length")
|
|
|
|
args.append(str(max_input_length))
|
2024-04-23 15:04:44 -06:00
|
|
|
if max_batch_prefill_tokens:
|
|
|
|
args.append("--max-batch-prefill-tokens")
|
|
|
|
args.append(str(max_batch_prefill_tokens))
|
Adding Llava-Next (Llava 1.6) with full support. (#1709)
# What does this PR do?
- Changed all models to extract `embed_tokens` in order to enable llava
to separately call the embeddings and the core model layers.
- Added VlmCausalLM to inherit from FlashMistral in order to be
maximally supported. The only added logics sits on top and parses images
into pixel values, preallocates input_ids space for the image
embeddings, and passes them for the model.
- Added Clip for the vision tower.
- Didn't add flash for the vision tower since there's no padding anyway.
- Added heuristic (potentially incomplete) to calculate number of
features *before* calculating the clip patches (allows for easier logic
reuse of the LLM under the hood).
Still needs to be done:
- [x] Implement the image parsing in the controller side, to avoid
downloading n times per TP shard and also refusing requests too large
early and avoid issues where the truncation actually truncates the
image.
- [ ] Make sure it works with quantization properly.
- [x] Make sure it works with TP>1
<!--
Congratulations! You've made it this far! You're not quite done yet
though.
Once merged, your PR is going to appear in the release notes with the
title you set, so make sure it's a great title that fully reflects the
extent of your awesome contribution.
Then, please replace this with a description of the change and which
issue is fixed (if applicable). Please also include relevant motivation
and context. List any dependencies (if any) that are required for this
change.
Once you're done, someone will review your PR shortly (see the section
"Who can review?" below to tag some potential reviewers). They may
suggest changes to make the code even better. If no one reviewed your PR
after a week has passed, don't hesitate to post a new comment
@-mentioning the same persons---sometimes notifications get lost.
-->
<!-- Remove if not applicable -->
Fixes # (issue)
## Before submitting
- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Did you read the [contributor
guideline](https://github.com/huggingface/transformers/blob/main/CONTRIBUTING.md#start-contributing-pull-requests),
Pull Request section?
- [ ] Was this discussed/approved via a Github issue or the
[forum](https://discuss.huggingface.co/)? Please add a link
to it if that's the case.
- [ ] Did you make sure to update the documentation with your changes?
Here are the
[documentation
guidelines](https://github.com/huggingface/transformers/tree/main/docs),
and
[here are tips on formatting
docstrings](https://github.com/huggingface/transformers/tree/main/docs#writing-source-documentation).
- [ ] Did you write any new necessary tests?
## Who can review?
Anyone in the community is free to review the PR once the tests have
passed. Feel free to tag
members/contributors who may be interested in your PR.
<!-- Your PR will be replied to more quickly if you can figure out the
right person to tag with @
@OlivierDehaene OR @Narsil
-->
2024-04-09 13:32:00 -06:00
|
|
|
if max_total_tokens:
|
|
|
|
args.append("--max-total-tokens")
|
|
|
|
args.append(str(max_total_tokens))
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
client = docker.from_env()
|
|
|
|
|
|
|
|
container_name = f"tgi-tests-{model_id.split('/')[-1]}-{num_shard}-{quantize}"
|
|
|
|
|
|
|
|
try:
|
|
|
|
container = client.containers.get(container_name)
|
|
|
|
container.stop()
|
|
|
|
container.wait()
|
|
|
|
except NotFound:
|
|
|
|
pass
|
|
|
|
|
|
|
|
gpu_count = num_shard if num_shard is not None else 1
|
|
|
|
|
2024-02-12 02:09:29 -07:00
|
|
|
env = {
|
|
|
|
"LOG_LEVEL": "info,text_generation_router=debug",
|
|
|
|
}
|
2023-06-08 06:51:52 -06:00
|
|
|
if not use_flash_attention:
|
|
|
|
env["USE_FLASH_ATTENTION"] = "false"
|
|
|
|
|
2023-05-15 15:36:30 -06:00
|
|
|
if HUGGING_FACE_HUB_TOKEN is not None:
|
|
|
|
env["HUGGING_FACE_HUB_TOKEN"] = HUGGING_FACE_HUB_TOKEN
|
|
|
|
|
|
|
|
volumes = []
|
|
|
|
if DOCKER_VOLUME:
|
|
|
|
volumes = [f"{DOCKER_VOLUME}:/data"]
|
|
|
|
|
|
|
|
container = client.containers.run(
|
|
|
|
DOCKER_IMAGE,
|
|
|
|
command=args,
|
|
|
|
name=container_name,
|
|
|
|
environment=env,
|
2023-05-16 12:22:11 -06:00
|
|
|
auto_remove=False,
|
2023-05-15 15:36:30 -06:00
|
|
|
detach=True,
|
|
|
|
device_requests=[
|
|
|
|
docker.types.DeviceRequest(count=gpu_count, capabilities=[["gpu"]])
|
|
|
|
],
|
|
|
|
volumes=volumes,
|
|
|
|
ports={"80/tcp": port},
|
2023-12-11 06:49:52 -07:00
|
|
|
shm_size="1G",
|
2023-05-15 15:36:30 -06:00
|
|
|
)
|
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
yield ContainerLauncherHandle(client, container.name, port)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
2023-06-08 06:51:52 -06:00
|
|
|
if not use_flash_attention:
|
|
|
|
del env["USE_FLASH_ATTENTION"]
|
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
try:
|
|
|
|
container.stop()
|
|
|
|
container.wait()
|
|
|
|
except NotFound:
|
|
|
|
pass
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
container_output = container.logs().decode("utf-8")
|
2023-05-16 15:23:27 -06:00
|
|
|
print(container_output, file=sys.stderr)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
container.remove()
|
|
|
|
|
2023-05-15 15:36:30 -06:00
|
|
|
if DOCKER_IMAGE is not None:
|
|
|
|
return docker_launcher
|
|
|
|
return local_launcher
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
|
|
def generate_load():
|
|
|
|
async def generate_load_inner(
|
2024-02-15 02:28:10 -07:00
|
|
|
client: AsyncClient,
|
|
|
|
prompt: str,
|
|
|
|
max_new_tokens: int,
|
|
|
|
n: int,
|
|
|
|
seed: Optional[int] = None,
|
|
|
|
grammar: Optional[Grammar] = None,
|
|
|
|
stop_sequences: Optional[List[str]] = None,
|
2023-05-15 15:36:30 -06:00
|
|
|
) -> List[Response]:
|
|
|
|
futures = [
|
2023-06-02 09:12:30 -06:00
|
|
|
client.generate(
|
2024-02-15 02:28:10 -07:00
|
|
|
prompt,
|
|
|
|
max_new_tokens=max_new_tokens,
|
|
|
|
decoder_input_details=True,
|
|
|
|
seed=seed,
|
|
|
|
grammar=grammar,
|
|
|
|
stop_sequences=stop_sequences,
|
2023-06-02 09:12:30 -06:00
|
|
|
)
|
|
|
|
for _ in range(n)
|
2023-05-15 15:36:30 -06:00
|
|
|
]
|
|
|
|
|
2023-05-16 12:22:11 -06:00
|
|
|
return await asyncio.gather(*futures)
|
2023-05-15 15:36:30 -06:00
|
|
|
|
|
|
|
return generate_load_inner
|