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.

Sign up for GitHub

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

[Bugfix] Fix issues in CPU build Dockerfile. Fixes #9182 #11435

Merged
merged 2 commits into from
Dec 24, 2024
+10 −6
Merged

[Bugfix] Fix issues in CPU build Dockerfile. Fixes #9182 #11435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d478688
Fix issues in CPU build Dockerfile
terrytangyuan Dec 23, 2024
61a2d89
Add a TODO
terrytangyuan Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ RUN pip install intel_extension_for_pytorch==2.5.0

WORKDIR /workspace

COPY requirements-build.txt requirements-build.txt
ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu"
ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=bind,src=requirements-build.txt,target=requirements-build.txt \
pip install --upgrade pip && \
pip install -r requirements-build.txt

FROM cpu-test-1 AS build

WORKDIR /workspace/vllm

COPY requirements-common.txt requirements-common.txt
COPY requirements-cpu.txt requirements-cpu.txt
RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=bind,src=requirements-common.txt,target=requirements-common.txt \
--mount=type=bind,src=requirements-cpu.txt,target=requirements-cpu.txt \
pip install -v -r requirements-cpu.txt

COPY . .
Expand Down
10 changes: 7 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,9 +455,13 @@ def get_gaudi_sw_version():


def get_vllm_version() -> str:
version = get_version(
write_to="vllm/_version.py", # TODO: move this to pyproject.toml
)
# TODO: Revisit this temporary approach: https://github.com/vllm-project/vllm/issues/9182#issuecomment-2404860236
try:
version = get_version(
write_to="vllm/_version.py", # TODO: move this to pyproject.toml
)
except LookupError:
version = "0.0.0"
Comment on lines +459 to +464
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd rather revert this change, as it can hide problems with the build

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Happy to revert in a separate PR if you know any other approach that would unblock this.

Copy link
Contributor

Choose a reason for hiding this comment

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

I could not reproduce the build failures with podman 5.3.1. What version are you using?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am using 5.3.1 as well

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you show the output of ls -l ls -l req*.txt?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

-rw-r--r--. 1 yutang yutang   126 Nov  9 07:55 requirements-build.txt
-rw-r--r--. 1 yutang yutang  1729 Dec 21 20:28 requirements-common.txt
-rw-r--r--. 1 yutang yutang   359 Dec 21 20:28 requirements-cpu.txt
-rw-r--r--. 1 yutang yutang   465 Dec 21 20:28 requirements-cuda.txt
-rw-r--r--. 1 yutang yutang   152 Oct 24 01:12 requirements-dev.txt
-rw-r--r--. 1 yutang yutang   222 Dec 21 20:28 requirements-hpu.txt
-rw-r--r--. 1 yutang yutang   210 Dec 21 20:28 requirements-lint.txt
-rw-r--r--. 1 yutang yutang   149 Oct 24 01:12 requirements-neuron.txt
-rw-r--r--. 1 yutang yutang   475 Nov  9 07:55 requirements-openvino.txt
-rw-r--r--. 1 yutang yutang   161 Dec 21 20:28 requirements-rocm.txt
-rw-r--r--. 1 yutang yutang 10838 Dec 21 20:28 requirements-test.txt
-rw-r--r--. 1 yutang yutang   730 Dec 21 20:28 requirements-tpu.txt
-rw-r--r--. 1 yutang yutang   616 Dec 21 20:28 requirements-xpu.txt

Copy link
Contributor

Choose a reason for hiding this comment

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

Might be due to SELinux, can you check if that's active with sestatus?

Copy link
Contributor

Choose a reason for hiding this comment

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

containers/buildah#4184 (comment) might help

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sestatus
SELinux status:                 enabled
SELinuxfs mount:                /sys/fs/selinux
SELinux root directory:         /etc/selinux
Loaded policy name:             targeted
Current mode:                   enforcing
Mode from config file:          enforcing
Policy MLS status:              enabled
Policy deny_unknown status:     allowed
Memory protection checking:     actual (secure)
Max kernel policy version:      33

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This works. Thanks!


sep = "+" if "+" not in version else "." # dev versions might contain +

Expand Down
Loading