[Misc] Upgrade to pytorch 2.5 #9588

bnellnm · 2024-10-22T15:01:28Z

Upgrade to pytorch 2.5

Requires changes to flash attn: vllm-project/flash-attention#23

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.

Adding or changing kernels

Each custom kernel needs a schema and one or more implementations to be registered with PyTorch.

Make sure custom ops are registered following PyTorch guidelines: Custom C++ and CUDA Operators and The Custom Operators Manual
Custom operations that return Tensors require meta-functions. Meta-functions should be implemented and registered in python so that dynamic dims can be handled automatically. See above documents for a description of meta-functions.
Use torch.libary.opcheck() to test the function registration and meta-function for any registered ops. See tests/kernels for examples.
When changing the C++ signature of an existing op, the schema must be updated to reflect the changes.
If a new custom type is needed, see the following document: Custom Class Support in PT2.

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!

github-actions · 2024-10-22T15:01:41Z

👋 Hi! Thank you for contributing to the vLLM project.
Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can do one of these:

Add ready label to the PR
Enable auto-merge.

🚀

bnellnm · 2024-10-22T15:02:09Z

/ready

robertgshaw2-neuralmagic · 2024-10-22T15:14:19Z

requirements-cuda.txt

@@ -4,7 +4,7 @@
 # Dependencies for NVIDIA GPUs
 ray >= 2.9
 nvidia-ml-py # for pynvml package
-torch == 2.4.0
+torch == 2.5.0


Only concern here is now torch==2.5.0 uses the 12.4 cuda bindings by default. We might want to update the installation docs (including on the readme) to alert users that they may want to pass --extra-index-url https://download.pytorch.org/whl/cu121 during installation depending on the machine they are using

@robertgshaw2-neuralmagic Does this mean that there would need to be multiple vllm packages (one for 12.1 and one for 12.4)? Or should I try to install pytorch 2.5 built with 12.1 (if such a thing exists)?

youkaichao · 2024-10-23T04:22:24Z

@bnellnm it loos like there are some cmake errors:

[2024-10-22T15:09:27Z] #25 15.41 CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
--
  | [2024-10-22T15:09:27Z] #25 15.41 Please set them or make sure they are set and tested correctly in the CMake files:
  | [2024-10-22T15:09:27Z] #25 15.41 CUDA_CUDA_LIBRARY (ADVANCED)
  | [2024-10-22T15:09:27Z] #25 15.41     linked by target "_moe_C" in directory /workspace
  | [2024-10-22T15:09:27Z] #25 15.41     linked by target "_C" in directory /workspace
  | [2024-10-22T15:09:27Z] #25 15.41     linked by target "vllm_flash_attn_c" in directory /workspace/.deps/vllm-flash-attn-src
  | [2024-10-22T15:09:27Z] #25 15.41

the cuda version should not matter that much. I think our current pipeline should still work even if pytorch itself is built against cuda 12.4 .

tlrmchlsmth · 2024-10-23T18:21:11Z

@bnellnm it loos like there are some cmake errors:

[2024-10-22T15:09:27Z] #25 15.41 CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
--
  | [2024-10-22T15:09:27Z] #25 15.41 Please set them or make sure they are set and tested correctly in the CMake files:
  | [2024-10-22T15:09:27Z] #25 15.41 CUDA_CUDA_LIBRARY (ADVANCED)
  | [2024-10-22T15:09:27Z] #25 15.41     linked by target "_moe_C" in directory /workspace
  | [2024-10-22T15:09:27Z] #25 15.41     linked by target "_C" in directory /workspace
  | [2024-10-22T15:09:27Z] #25 15.41     linked by target "vllm_flash_attn_c" in directory /workspace/.deps/vllm-flash-attn-src
  | [2024-10-22T15:09:27Z] #25 15.41

the cuda version should not matter that much. I think our current pipeline should still work even if pytorch itself is built against cuda 12.4 .

Looks related to #8609

Signed-off-by: Bill Nell <bill@neuralmagic.com>

tlrmchlsmth · 2024-10-25T18:59:24Z

cmake/utils.cmake

-    endif()
-    target_link_libraries(${GPU_MOD_NAME} PRIVATE ${CUDA_CUDA_LIB}
-      ${CUDA_LIBRARIES})
+    target_link_libraries(${GPU_MOD_NAME} PRIVATE CUDA::cudart CUDA::cuda_driver)


tlrmchlsmth · 2024-10-25T19:05:52Z

pyproject.toml

@@ -6,7 +6,7 @@ requires = [
    "packaging",
    "setuptools>=61",
    "setuptools-scm>=8.0",
-    "torch == 2.4.0",
+    "torch == 2.5.0 --extra-index-url https://download.pytorch.org/whl/cu121",


Given @youkaichao's comment:

the cuda version should not matter that much. I think our current pipeline should still work even if pytorch itself is built against cuda 12.4 .

We should consider ditching the --extra-index-url. Perhaps this should be configurable, but one thing to note is that 2:4 sparse fp8 will require the Pytorch version that's built with 12.4

tlrmchlsmth

The PR looks good but we should quickly come to a consensus on what to do with the CUDA version that pytorch is built against

robertgshaw2-neuralmagic · 2024-10-25T19:08:53Z

The PR looks good but we should quickly come to a consensus on what to do with the CUDA version that pytorch is built against

Im fine to remove the --extra-index-url if we decide to make 12.4 the default wheel for vllm. But we should still ship 12.1 and 11.8 wheels IMO

Signed-off-by: Bill Nell <bill@neuralmagic.com>

tlrmchlsmth · 2024-10-25T19:55:32Z

CMakeLists.txt

@@ -507,7 +507,7 @@ else()
  FetchContent_Declare(
          vllm-flash-attn
          GIT_REPOSITORY https://github.com/vllm-project/flash-attention.git
-          GIT_TAG 013f0c4fc47e6574060879d9734c1df8c5c273bd
+          GIT_TAG 5259c586c403a4e4d8bf69973c159b40cc346fb9


Signed-off-by: Bill Nell <bill@neuralmagic.com>

DarkLight1337 · 2024-10-26T06:01:34Z

Please merge from main to fix the CI failures for multi-modal models.

youkaichao

excited to see it happen!

Signed-off-by: youkaichao <youkaichao@gmail.com>

youkaichao · 2024-10-27T03:07:13Z

some errors are real:

cuDNN Frontend error: [cudnn_frontend] Error: No execution plans support the graph.

huggingface/diffusers#9704

fixing by 0068133

Signed-off-by: youkaichao <youkaichao@gmail.com>

youkaichao · 2024-10-27T07:37:48Z

pytorch 2.5 changes the output slightly:

[2024-10-27T04:21:27Z] hf: ‘vLLM is a high-throughput and memory-efficient inference and serving engine for LLMs.\n\n- Advantages of using the LLM:\n - High-fidelity and accurate predictions: The LLM can generate high-quality and context’
[2024-10-27T04:21:27Z] vllm: ‘vLLM is a high-throughput and memory-efficient inference and serving engine for LLMs.\n\n- Advantages of using the LLM:\n - High-efficiency and low-latency inference: The LLM provides fast and efficient’

The output is still sensible.

Therefore I changed it to logprobs check instead.

For future reference, we can also change to logprobs check if exact comparison is not feasible while it is not our fault (due to pytorch or huggingface numerical change).

bnellnm requested review from tlrmchlsmth and WoosukKwon as code owners October 22, 2024 15:01

bnellnm changed the title ~~Upgrade to pytorch 2.5~~ [Misc] Upgrade to pytorch 2.5 Oct 22, 2024

bnellnm force-pushed the pt25 branch from 36b1df8 to 6eb440d Compare October 22, 2024 15:02

robertgshaw2-neuralmagic reviewed Oct 22, 2024

View reviewed changes

bnellnm added 3 commits October 25, 2024 18:03

upgrade to pytorch 2.5 (still needs newer xformers

e970933

Signed-off-by: Bill Nell <bill@neuralmagic.com>

update xformers

5a54b48

Signed-off-by: Bill Nell <bill@neuralmagic.com>

use better method for specifying cuda libs

1ea632b

Signed-off-by: Bill Nell <bill@neuralmagic.com>

bnellnm force-pushed the pt25 branch from 47dbd22 to 1ea632b Compare October 25, 2024 18:04

ProExpertProg approved these changes Oct 25, 2024

View reviewed changes

try to make pytorch 2.5 use CUDA 12.1

c00efe3

Signed-off-by: Bill Nell <bill@neuralmagic.com>

tlrmchlsmth reviewed Oct 25, 2024

View reviewed changes

bnellnm added 2 commits October 25, 2024 19:43

remove extra index 12.1 for now

c4ebdba

Signed-off-by: Bill Nell <bill@neuralmagic.com>

update flash attn git hash

39f9c34

Signed-off-by: Bill Nell <bill@neuralmagic.com>

tlrmchlsmth approved these changes Oct 25, 2024

View reviewed changes

tlrmchlsmth added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 25, 2024

downgrade cpu pytorch version

f1f3caa

Signed-off-by: Bill Nell <bill@neuralmagic.com>

Merge branch 'main' into pt25

568510a

youkaichao approved these changes Oct 27, 2024

View reviewed changes

fix sdpa cudnn

0068133

Signed-off-by: youkaichao <youkaichao@gmail.com>

fix tests

5250a65

Signed-off-by: youkaichao <youkaichao@gmail.com>

youkaichao requested a review from DarkLight1337 as a code owner October 27, 2024 07:36

youkaichao requested a review from ywang96 as a code owner October 27, 2024 07:36

youkaichao enabled auto-merge (squash) October 27, 2024 08:23

youkaichao merged commit 3cb07a3 into vllm-project:main Oct 27, 2024
80 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Misc] Upgrade to pytorch 2.5 #9588

[Misc] Upgrade to pytorch 2.5 #9588

bnellnm commented Oct 22, 2024 •

edited

Loading

github-actions bot commented Oct 22, 2024

bnellnm commented Oct 22, 2024

robertgshaw2-neuralmagic Oct 22, 2024 •

edited

Loading

bnellnm Oct 25, 2024

youkaichao commented Oct 23, 2024

tlrmchlsmth commented Oct 23, 2024

tlrmchlsmth Oct 25, 2024

tlrmchlsmth Oct 25, 2024

tlrmchlsmth left a comment •

edited

Loading

robertgshaw2-neuralmagic commented Oct 25, 2024 •

edited

Loading

tlrmchlsmth Oct 25, 2024

DarkLight1337 commented Oct 26, 2024

youkaichao left a comment

youkaichao commented Oct 27, 2024

youkaichao commented Oct 27, 2024

[Misc] Upgrade to pytorch 2.5 #9588

[Misc] Upgrade to pytorch 2.5 #9588

Conversation

bnellnm commented Oct 22, 2024 • edited Loading

PR Title and Classification

Code Quality

Adding or changing kernels

Notes for Large Changes

What to Expect for the Reviews

Thank You

github-actions bot commented Oct 22, 2024

bnellnm commented Oct 22, 2024

robertgshaw2-neuralmagic Oct 22, 2024 • edited Loading

Choose a reason for hiding this comment

bnellnm Oct 25, 2024

Choose a reason for hiding this comment

youkaichao commented Oct 23, 2024

tlrmchlsmth commented Oct 23, 2024

tlrmchlsmth Oct 25, 2024

Choose a reason for hiding this comment

tlrmchlsmth Oct 25, 2024

Choose a reason for hiding this comment

tlrmchlsmth left a comment • edited Loading

Choose a reason for hiding this comment

robertgshaw2-neuralmagic commented Oct 25, 2024 • edited Loading

tlrmchlsmth Oct 25, 2024

Choose a reason for hiding this comment

DarkLight1337 commented Oct 26, 2024

youkaichao left a comment

Choose a reason for hiding this comment

youkaichao commented Oct 27, 2024

youkaichao commented Oct 27, 2024

bnellnm commented Oct 22, 2024 •

edited

Loading

robertgshaw2-neuralmagic Oct 22, 2024 •

edited

Loading

tlrmchlsmth left a comment •

edited

Loading

robertgshaw2-neuralmagic commented Oct 25, 2024 •

edited

Loading