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

updates for vLLM==0.5.4 #82

Merged
merged 9 commits into from
Aug 7, 2024
Merged

updates for vLLM==0.5.4 #82

merged 9 commits into from
Aug 7, 2024

Conversation

dtrifiro
Copy link
Contributor

@dtrifiro dtrifiro commented Aug 6, 2024

adaptations for vLLM==0.5.4

tests/conftest.py Outdated Show resolved Hide resolved
http_server_task = loop.create_task(run_http_server(engine, args, model_config))
grpc_server_task = loop.create_task(
run_grpc_server(
engine, args, disable_log_stats=engine_args.disable_log_stats
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note that I've gotten rid of the disable_log_stats argument, as the _force_log coroutine is scheduled as part of the lifespan attribute of the fastapi server.

@dtrifiro dtrifiro force-pushed the get-rid-of-upstream-code branch 3 times, most recently from e1bda2a to aab12db Compare August 6, 2024 14:27
@dtrifiro dtrifiro marked this pull request as ready for review August 6, 2024 14:36
@codecov-commenter
Copy link

codecov-commenter commented Aug 6, 2024

Codecov Report

Attention: Patch coverage is 84.02778% with 23 lines in your changes missing coverage. Please review.

Project coverage is 61.13%. Comparing base (08738d2) to head (7cb6234).
Report is 1 commits behind head on main.

Files Patch % Lines
tests/conftest.py 79.59% 6 Missing and 4 partials ⚠️
src/vllm_tgis_adapter/utils.py 69.23% 3 Missing and 1 partial ⚠️
src/vllm_tgis_adapter/grpc/grpc_server.py 75.00% 2 Missing and 1 partial ⚠️
tests/utils.py 50.00% 2 Missing and 1 partial ⚠️
src/vllm_tgis_adapter/__main__.py 93.10% 2 Missing ⚠️
src/vllm_tgis_adapter/grpc/adapters.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #82      +/-   ##
==========================================
- Coverage   62.73%   61.13%   -1.60%     
==========================================
  Files          18       20       +2     
  Lines        1280     1181      -99     
  Branches      227      209      -18     
==========================================
- Hits          803      722      -81     
+ Misses        399      383      -16     
+ Partials       78       76       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

pyproject.toml Show resolved Hide resolved
if (device_type := engine.engine.device_config.device.type) == "cuda":
logger.info(memory_summary(engine.engine.device_config.device))
else:
logger.warning("Cannot print device usage for device type: %s", device_type)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We cannot print the memory summary anymore, as this method is not available from the engine client.

Copy link
Contributor

@njhill njhill left a comment

Choose a reason for hiding this comment

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

Thanks @dtrifiro! It's nice that we can remove so much of the duplicated code now

src/vllm_tgis_adapter/__main__.py Show resolved Hide resolved
src/vllm_tgis_adapter/grpc/grpc_server.py Outdated Show resolved Hide resolved
src/vllm_tgis_adapter/grpc/grpc_server.py Outdated Show resolved Hide resolved
src/vllm_tgis_adapter/grpc/grpc_server.py Outdated Show resolved Hide resolved
src/vllm_tgis_adapter/__main__.py Outdated Show resolved Hide resolved
@dtrifiro dtrifiro force-pushed the get-rid-of-upstream-code branch 2 times, most recently from 8477d51 to 46ae710 Compare August 6, 2024 19:56
@dtrifiro
Copy link
Contributor Author

dtrifiro commented Aug 7, 2024

Parametrization is disabled because of this error

@dtrifiro dtrifiro merged commit 8a7c5a2 into main Aug 7, 2024
3 checks passed
@dtrifiro dtrifiro deleted the get-rid-of-upstream-code branch August 7, 2024 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants