Skip to content

chore: deduplicate CuPy installation in Dockerfiles#176

Merged
aiwantaozi merged 1 commit into
gpustack:mainfrom
yxf0314:vllm0.22.0-2
Jun 5, 2026
Merged

chore: deduplicate CuPy installation in Dockerfiles#176
aiwantaozi merged 1 commit into
gpustack:mainfrom
yxf0314:vllm0.22.0-2

Conversation

@yxf0314
Copy link
Copy Markdown
Contributor

@yxf0314 yxf0314 commented Jun 3, 2026

No description provided.

Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces a step to deduplicate CuPy in both pack/cuda/Dockerfile and pack/cuda/Dockerfile.vllm by purging conflicting cupy-cuda12x and cupy-cuda13x packages and reinstalling the correct variant matching the CUDA major version. The review feedback correctly identifies a potential build failure: because the shell runs with pipefail and errexit, if uv pip show fails when the package is not already installed, the command substitution will abort the Docker build. The reviewer suggests appending || true inside the command substitution to prevent this issue.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread pack/cuda/Dockerfile Outdated
Comment thread pack/cuda/Dockerfile.vllm Outdated
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR adds a CuPy “deduplication” step to the CUDA Docker images to avoid conflicts where multiple cupy-cuda* distributions (e.g., cupy-cuda12x and cupy-cuda13x) are installed simultaneously and overwrite the same cupy/ module tree.

Changes:

  • Add a new Docker build step that uninstalls cupy-cuda12x/cupy-cuda13x, removes the shared cupy/ directories, and reinstalls the CUDA-major-appropriate CuPy variant.
  • Apply the same CuPy dedupe logic to both the main CUDA image Dockerfile and the vLLM-based Dockerfile.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
pack/cuda/Dockerfile.vllm Adds a CuPy deduplication RUN block before postprocessing.
pack/cuda/Dockerfile Adds a CuPy deduplication RUN block before postprocessing.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread pack/cuda/Dockerfile.vllm
Comment thread pack/cuda/Dockerfile Outdated
@aiwantaozi
Copy link
Copy Markdown
Collaborator

The pack/cuda/Dockerfile (non-.vllm) copy is dead code, prefer no update it.

Comment thread pack/cuda/Dockerfile.vllm Outdated
Comment thread pack/cuda/Dockerfile.vllm Outdated
@yxf0314 yxf0314 force-pushed the vllm0.22.0-2 branch 2 times, most recently from 53d05ca to 3e71907 Compare June 4, 2026 11:23
Comment thread pack/cuda/Dockerfile.vllm Outdated
Comment thread pack/cuda/Dockerfile.vllm Outdated
Comment thread pack/cuda/Dockerfile.vllm
Copy link
Copy Markdown
Collaborator

@aiwantaozi aiwantaozi left a comment

Choose a reason for hiding this comment

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

LGTM

@aiwantaozi aiwantaozi merged commit c93663b into gpustack:main Jun 5, 2026
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.

3 participants