-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
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
[CI/Build] setuptools-scm fixes #8900
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,16 +9,7 @@ RUN apt-get update -y && \ | |
ffmpeg libsm6 libxext6 libgl1 | ||
WORKDIR /workspace | ||
|
||
# copy requirements | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we copy files separately to avoid docker build cache invalidation. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this a problem? The next step builds vllm, and that relies |
||
COPY requirements-build.txt /workspace/vllm/ | ||
COPY requirements-common.txt /workspace/vllm/ | ||
COPY requirements-openvino.txt /workspace/vllm/ | ||
|
||
COPY vllm/ /workspace/vllm/vllm | ||
COPY csrc/core /workspace/vllm/csrc/core | ||
COPY cmake/utils.cmake /workspace/vllm/cmake/ | ||
COPY CMakeLists.txt /workspace/vllm/ | ||
COPY setup.py /workspace/vllm/ | ||
COPY . . | ||
|
||
# install build requirements | ||
RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" python3 -m pip install -r /workspace/vllm/requirements-build.txt | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -267,23 +267,16 @@ def get_neuron_sdk_version(run_lambda): | |
|
||
|
||
def get_vllm_version(): | ||
version = "" | ||
try: | ||
import vllm | ||
version = vllm.__version__ | ||
except Exception: | ||
pass | ||
commit = "" | ||
try: | ||
import vllm | ||
commit = vllm.__commit__ | ||
except Exception: | ||
pass | ||
if version != "" and commit != "": | ||
return f"{version}@{commit}" | ||
if version == "" and commit == "": | ||
return "N/A" | ||
return version or commit | ||
from vllm import __version__, __version_tuple__ | ||
|
||
if __version__ == "dev": | ||
return "N/A (dev)" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
In this case, I think we have no reason for setting this to |
||
|
||
if len(__version_tuple__) == 4: # dev build | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is this 4 particularly? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can I get some more context on There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can find the For dev builds, version tuple is going to look like this:
for exact tags, version tuple is going to look like this:
i.e. you have an extra field for development builds which includes the git sha |
||
git_sha = __version_tuple__[-1][1:] # type: ignore | ||
return f"{__version__} (git sha: {git_sha}" | ||
|
||
return __version__ | ||
|
||
def summarize_vllm_build_flags(): | ||
# This could be a static method if the flags are constant, or dynamic if you need to check environment variables, etc. | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These additions should be safe and should make sure that
COPY . .
in the Dockerfiles does not copy any additional files that shouldn't go in a build.I'm unsure on whether there's anything else we might need to add here to avoid copying temporary from the host into the container build (mostly thinking about
vllm/vllm_flash_attn
right now)