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

[Test] Make model tests run again and remove --forked from pytest #3631

Merged
merged 15 commits into from
Mar 29, 2024

Conversation

rkooo567
Copy link
Collaborator

@rkooo567 rkooo567 commented Mar 26, 2024

This PR makes model_tests work by

  1. Right now, some tests fail because fork is called after cuda context is initialized. This is due to the usage of --forked [Bug]: Using pytest --forked when CUDA is not generally fork-safe #3557. The reason why --forked is required is to clean up resources by simply killling processes. This PR removes the usage of --forked from pytest and instead doing clean up using fixtures.
  2. Fixed the issue where del hf_model or del vllm_model doesn't actually clean up GPU usage.
  3. When running a large model in small GPUs (like the one used in CI) vllm fails to initialize because the machine doesn't have kv cache to match model_len. It uses the smaller model_len by default (1024) to avoid this issue. Note that none of tests require more than 128 tokens to generate.
  4. Separate out big models (7B) to different test suites.
  5. Skip failed model tests. Also remove soft_fail: true from model tests

The following models fail to succeed.

  • allenai/OLMo-1B: TypeError: forward() got an unexpected keyword argument 'cache_position'
  • mistralai/Mistral-7B-v0.1: correctness issue (generate doesn't generate any token) + RuntimeError: expected scalar type BFloat16 but found Half (only in CI)
  • Deci/DeciLM-7b: correctness issue (output is different)
  • tiiuae/falcon-7b: correctness issue (output is different)
    -"Qwen/Qwen1.5-0.5B": Correctness issue

Closes #3557

BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE


PR Checklist (Click to Expand)

Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.

PR Title and Classification

Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:

  • [Bugfix] for bug fixes.
  • [CI/Build] for build or continuous integration improvements.
  • [Doc] for documentation fixes and improvements.
  • [Model] for adding a new model or improving an existing model. Model name should appear in the title.
  • [Frontend] For changes on the vLLM frontend (e.g., OpenAI API server, LLM class, etc.)
  • [Kernel] for changes affecting CUDA kernels or other compute kernels.
  • [Core] for changes in the core vLLM logic (e.g., LLMEngine, AsyncLLMEngine, Scheduler, etc.)
  • [Hardware][Vendor] for hardware-specific changes. Vendor name should appear in the prefix (e.g., [Hardware][AMD]).
  • [Misc] for PRs that do not fit the above categories. Please use this sparingly.

Note: If the PR spans more than one category, please include all relevant prefixes.

Code Quality

The PR need to meet the following code quality standards:

  • We adhere to Google Python style guide and Google C++ style guide.
  • Pass all linter checks. Please use format.sh to format your code.
  • The code need to be well-documented to ensure future contributors can easily understand the code.
  • Include sufficient tests to ensure the project to stay correct and robust. This includes both unit tests and integration tests.
  • Please add documentation to docs/source/ if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.

Notes for Large Changes

Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with rfc-required and might not go through the PR.

What to Expect for the Reviews

The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:

  • After the PR is submitted, the PR will be assigned to a reviewer. Every reviewer will pick up the PRs based on their expertise and availability.
  • After the PR is assigned, the reviewer will provide status update every 2-3 days. If the PR is not reviewed within 7 days, please feel free to ping the reviewer or the vLLM team.
  • After the review, the reviewer will put an action-required label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.
  • Please respond to all comments within a reasonable time frame. If a comment isn't clear or you disagree with a suggestion, feel free to ask for clarification or discuss the suggestion.

Thank You

Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!

@@ -148,7 +148,7 @@ def server(zephyr_lora_files):
ray.shutdown()


@pytest.fixture(scope="session")
@pytest.fixture
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

without this, the global cleanup conftest cleans this up

@rkooo567 rkooo567 changed the title [WIP] fix cuda context with --fork issue trial Make model tests run again and remove --forked from pytest Mar 27, 2024
@rkooo567 rkooo567 changed the title Make model tests run again and remove --forked from pytest [Test] Make model tests run again and remove --forked from pytest Mar 27, 2024
Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe revert this since the comment says the extra del line is needed for different GPUs?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it is actually broken because marlin_model.model.llm_engine.driver_worker doesn't exist anymore. I believe what I am doing in __del__ inside vllm runner should do the same thing (and the test seems passing?).

tests/entrypoints/test_openai_server.py Outdated Show resolved Hide resolved

@pytest.mark.parametrize("model", MODELS)
@pytest.mark.parametrize("dtype", ["half"])
@pytest.mark.parametrize("max_tokens", [5])
Copy link
Collaborator

Choose a reason for hiding this comment

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

can this be more?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Trying 128. But these models currently use half precision, so I think having large values here is risky (we should use a bigger machine eventually to resolve it. )

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Big model tests seem to fail with 128. Let me try 64 and see how it goes

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

32 makes "EleutherAI/gpt-j-6b", pass. "Qwen/Qwen1.5-0.5B" didn't pass on 32 (but passed on 5), so I just skipped it for now

tests/models/test_models.py Show resolved Hide resolved
tests/models/test_models.py Show resolved Hide resolved
tests/models/test_models.py Outdated Show resolved Hide resolved
@rkooo567 rkooo567 requested a review from simon-mo March 28, 2024 13:38
@rkooo567
Copy link
Collaborator Author

@simon-mo addressed all comments!

Copy link
Collaborator

@cadedaniel cadedaniel left a comment

Choose a reason for hiding this comment

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

Thanks for cleaning this up!

@simon-mo simon-mo merged commit 26422e4 into vllm-project:main Mar 29, 2024
34 checks passed
xjpang pushed a commit to xjpang/vllm that referenced this pull request Mar 31, 2024
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.

[Bug]: Using pytest --forked when CUDA is not generally fork-safe
3 participants