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.

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

Ibm main update 2024-05-16 #25

Merged
merged 6 commits into from
May 16, 2024
Merged

Ibm main update 2024-05-16 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2caabff
format: make mypy happy (#24)
tjohnson31415 May 8, 2024
c737a7a
ci/build/feat: bump vLLM libs to v0.4.2 and other deps in Dockerfile.…
tjohnson31415 May 8, 2024
06d9876
TGISStatLogger: fix stats usage (#25)
tjohnson31415 May 8, 2024
21fb852
fix: use vllm_nccl installed nccl version (#26)
tjohnson31415 May 13, 2024
2e81ed2
:bug: fix prometheus metric labels (#27)
joerunde May 14, 2024
a72d13a
Merge remote-tracking branch 'ibm-vllm/main' into ibm_main_update_051…
z103cb May 16, 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
6 changes: 3 additions & 3 deletions Dockerfile.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ COPY --from=gen-protos /workspace/vllm/entrypoints/grpc/pb vllm/entrypoints/grpc
ENV CCACHE_DIR=/root/.cache/ccache
RUN --mount=type=cache,target=/root/.cache/ccache \
--mount=type=cache,target=/root/.cache/pip \
python setup.py bdist_wheel --dist-dir=dist
VLLM_USE_PRECOMPILED=1 python3 setup.py bdist_wheel --dist-dir=dist

#################### FLASH_ATTENTION Build IMAGE ####################
FROM dev as flash-attn-builder
Expand Down Expand Up @@ -258,7 +258,7 @@ RUN pip install \
--no-binary="all" \
--no-cache-dir \
"vllm-nccl-cu12==2.18.1.0.4.0" && \
mv /root/.config/vllm/nccl/cu12/libnccl.so.2.18.1 /opt/vllm/
mv /root/.config/vllm/nccl/cu12/libnccl.so.2.18.1 /opt/vllm/lib/

# Install flash attention (from pre-built wheel)
RUN --mount=type=bind,from=flash-attn-builder,src=/usr/src/flash-attention-v2,target=/usr/src/flash-attention-v2 \
Expand All @@ -277,7 +277,7 @@ ENV HF_HUB_OFFLINE=1 \
PORT=8000 \
GRPC_PORT=8033 \
HOME=/home/vllm \
VLLM_NCCL_SO_PATH=/opt/vllm/libnccl.so.2.18.1 \
VLLM_NCCL_SO_PATH=/opt/vllm/lib/libnccl.so.2.18.1 \
VLLM_USAGE_SOURCE=production-docker-image

# setup non-root user for OpenShift
Expand Down
10 changes: 3 additions & 7 deletions vllm/tgis_utils/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def observe_queue_time(self, engine_output: RequestOutput):
engine_output.metrics.time_in_queue)

def count_request_failure(self, reason: FailureReasonLabel):
self.tgi_request_failure.labels({"err": reason}).inc(1)
self.tgi_request_failure.labels(err=reason).inc(1)


class TGISStatLogger(StatLogger):
Expand Down Expand Up @@ -118,17 +118,13 @@ def log(self, stats: Stats) -> None:
# Then log TGIS specific ones
self.tgi_queue_size.set(stats.num_waiting_sys + stats.num_swapped_sys)
self.tgi_batch_current_size.set(stats.num_running_sys)
self.tgi_queue_size.set(stats.num_waiting_sys + stats.num_swapped_sys)
self.tgi_batch_current_size.set(stats.num_running_sys)

for ttft in stats.time_to_first_tokens_iter:
self.tgi_batch_inference_duration.labels(
{"method": "prefill"}
).observe(ttft)
method="prefill").observe(ttft)
for tpot in stats.time_per_output_tokens_iter:
self.tgi_batch_inference_duration.labels(
{"method": "next_token"}
).observe(tpot)
method="next_token").observe(tpot)

for input_len in stats.num_prompt_tokens_requests:
self.tgi_request_input_length.observe(input_len)
Expand Down