Skip to content

[Backport] Docker fixes from release/1.38#1735

Merged
Yunnglin merged 11 commits into
masterfrom
release/1.38-docker-fixes
Jun 26, 2026
Merged

[Backport] Docker fixes from release/1.38#1735
Yunnglin merged 11 commits into
masterfrom
release/1.38-docker-fixes

Conversation

@Yunnglin

Copy link
Copy Markdown
Collaborator

Summary

This PR backports Docker-related fixes from the release/1.38 branch to master. These commits were made on the release branch to fix Docker image builds and dependencies, and should also be applied to master to keep the Dockerfiles up-to-date.

Note: The version bump commit (872aa6eb update version v1.38.0) was intentionally excluded as it is release-specific.

Commits included

  • b87b344f Upgrade numpy to 2.x for 1.38 Docker images
  • 204caba8 fix: quote version of timm specs in Dockerfile.ubuntu (fix: quote version of timm specs in Dockerfile.ubuntu #1728) — skipped (empty after conflict resolution)
  • 1a534186 Add ipywidgets dependency to Docker images
  • faae8512 update docker
  • 7053c9d6 fix
  • 29442858 fix
  • c0416acc fix
  • f5990192 fix cpu image

Changes

  • Upgraded numpy to 2.x in Docker images
  • Added ipywidgets dependency to Docker images
  • Various Dockerfile fixes for CPU and Ascend images
  • Updated Docker configurations

These changes ensure Docker images build correctly and have the required dependencies.

Yunnglin and others added 7 commits June 11, 2026 15:29
- Replace deprecated numpy aliases (np.math.ceil → math.ceil, np.Inf → np.inf)
- Upgrade Docker constraints: numpy>=2.0, cython>=3.0, remove scipy upper bound
Copilot AI review requested due to automatic review settings June 11, 2026 07:30

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

Copy link
Copy Markdown
Contributor

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 updates several dependency versions across Dockerfiles and build scripts, including upgrading Python to 3.12.13, PyTorch to 2.10.0, and vLLM to 0.19.1. It also replaces deprecated NumPy calls (np.Inf and np.math.ceil) with standard Python equivalents. The review feedback highlights three key issues: first, reassigning the loop variable args to copy(args) in build_image.py accumulates mutations across builder iterations instead of using a clean copy; second, optimum_version was unpinned in install.sh but is still passed from build_image.py; and third, updating the default Python version to 3.12.13 causes a tagging mismatch for AscendImageBuilder, which relies on a Python 3.11 base image.

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 docker/build_image.py
Comment thread docker/install.sh
Comment thread docker/build_image.py

Copilot AI left a comment

Copy link
Copy Markdown

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 backports Docker build/dependency updates (notably moving Docker images to NumPy 2.x and adding missing deps) and includes small runtime code adjustments needed for NumPy 2 compatibility.

Changes:

  • Update Dockerfiles to use numpy>=2.0, relax SciPy pinning, and add ipywidgets; refresh some GPU dependency constraints.
  • Adjust Docker image build tooling/workflow (default versions, cache-busting CUR_TIME, stable/latest builder behavior).
  • Replace NumPy-aliased math/inf usage in a couple of Python modules for NumPy 2 compatibility (np.math.ceilmath.ceil, np.Infnp.inf).

Reviewed changes

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

Show a summary per file
File Description
modelscope/pipelines/multi_modal/soonet_video_temporal_grounding_pipeline.py Switch from np.math.ceil to math.ceil for NumPy 2 compatibility.
modelscope/models/cv/video_depth_estimation/models/model_checkpoint.py Switch from np.Inf to np.inf for NumPy 2 compatibility.
docker/install.sh Update install flow; positional version-arg handling needs to remain consistent with callers.
docker/Dockerfile.ubuntu.old Add CUR_TIME arg to force rebuild/cache busting.
docker/Dockerfile.ubuntu Move to NumPy 2 + dependency updates; add ipywidgets; adjust GPU/CPU dependency constraints.
docker/Dockerfile.ascend Align dependencies with NumPy 2 + add ipywidgets.
docker/build_image.py Update default versions, cache-busting substitution, builder behavior, and per-builder args copying.
.github/workflows/docker-image.yml Update default Python version to match image build tooling.

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

Comment thread docker/install.sh
Comment thread docker/install.sh
Yunnglin and others added 4 commits June 15, 2026 17:47
@Yunnglin Yunnglin merged commit 020cad8 into master Jun 26, 2026
2 of 4 checks passed
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.

6 participants