Fix Python packaging edge cases #17159
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Address some edge cases with packaging of Python subpackages in vLLM. The `vllm/benchmark` and `vllm/vllm_flash_attn` directories were missing `__init__.py` files. A subdirectory without an `__init__.py` is considered a namespace package. Because vLLM's `pyproject.toml` file excludes namespace packages, setuptools' package finder excludes the subpackages `vllm.benchmark` and `vllm.vllm_flash_attn` from wheel distributions. vLLM's wheels still shipped both subpackages, because vLLM also uses `setuptools-scm`. The build dependency hooks into setuptools and modifies its package finder. The override only works if-and-only-if a source checkout has a `.git` VCS directory. This change turns `vllm.benchmark` and `vllm.vllm_flash_attn` into regular importable packages and removes `namespaces = false` from setuptools' package finder configuration. It also changes the finder excludes into finder includes for `vllm*`, which matches `vllm` root package and all `vllm` subpackages. Closes: vllm-project#15812 Signed-off-by: Christian Heimes <[email protected]>
|
👋 Hi! Thank you for contributing to the vLLM project. 💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels. Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run 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 either: Add 🚀 |
mgoin
approved these changes
Apr 25, 2025
aarnphm
added a commit
to aarnphm/vllm
that referenced
this pull request
Apr 26, 2025
Signed-off-by: Aaron Pham <[email protected]>
jikunshang
pushed a commit
to jikunshang/vllm
that referenced
this pull request
Apr 29, 2025
Signed-off-by: Christian Heimes <[email protected]>
lk-chen
pushed a commit
to lk-chen/vllm
that referenced
this pull request
Apr 29, 2025
Signed-off-by: Christian Heimes <[email protected]>
adobrzyn
pushed a commit
to HabanaAI/vllm-fork
that referenced
this pull request
Apr 30, 2025
Signed-off-by: Christian Heimes <[email protected]> Signed-off-by: Agata Dobrzyniewicz <[email protected]>
RichardoMrMu
pushed a commit
to RichardoMrMu/vllm
that referenced
this pull request
May 12, 2025
Signed-off-by: Christian Heimes <[email protected]> Signed-off-by: Mu Huai <[email protected]>
zzzyq
pushed a commit
to zzzyq/vllm
that referenced
this pull request
May 24, 2025
Signed-off-by: Christian Heimes <[email protected]> Signed-off-by: Yuqi Zhang <[email protected]>
minpeter
pushed a commit
to minpeter/vllm
that referenced
this pull request
Jun 24, 2025
Signed-off-by: Christian Heimes <[email protected]> Signed-off-by: minpeter <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address some edge cases with packaging of Python subpackages in vLLM. The
vllm/benchmarkandvllm/vllm_flash_attndirectories were missing__init__.pyfiles. A subdirectory without an__init__.pyis considered a namespace package. Because vLLM'spyproject.tomlfile excludes namespace packages, setuptools' package finder excludes the subpackagesvllm.benchmarkandvllm.vllm_flash_attnfrom wheel distributions.vLLM's wheels still shipped both subpackages, because vLLM also uses
setuptools-scm. The build dependency hooks into setuptools and modifies its package finder. The override only works if-and-only-if a source checkout has a.gitVCS directory.This change turns
vllm.benchmarkandvllm.vllm_flash_attninto regular importable packages and removesnamespaces = falsefrom setuptools' package finder configuration. It also changes the finder excludes into finder includes forvllm*, which matchesvllmroot package and allvllmsubpackages.FIX #15812