Skip to content

Comments

Resolve forward-merge release/26.02 into main#849

Closed
AyodeAwe wants to merge 5 commits intorapidsai:mainfrom
AyodeAwe:main-merge-release/26.02
Closed

Resolve forward-merge release/26.02 into main#849
AyodeAwe wants to merge 5 commits intorapidsai:mainfrom
AyodeAwe:main-merge-release/26.02

Conversation

@AyodeAwe
Copy link
Contributor

@AyodeAwe AyodeAwe commented Feb 3, 2026

Address merge conflicts found in the bot's forward merger PR: #845

Conflicts resolved:

  • Dockerfile - Kept main's refactored scripts approach
  • context/.dockerignore - Combined both script files and pinned file entries

@AyodeAwe AyodeAwe requested a review from a team as a code owner February 3, 2026 19:09
Copy link
Member

@jameslamb jameslamb left a comment

Choose a reason for hiding this comment

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

Looks great, thank you for fixing this @AyodeAwe

No-squash merge whenever you're ready.

@jameslamb
Copy link
Member

tests are failing here only for Python 3.10:

File /opt/conda/lib/python3.12/site-packages/numba_cuda/numba/cuda/cuda_paths.py:569, in _get_nvvm.._raise_original(reason)
568 def _raise_original(reason: str) -> None:
--> 569 raise pathfinder.DynamicLibNotFoundError(
570 f"{reason}; original nvvm error: {nvvm_exc}"
571 ) from nvvm_exc

DynamicLibNotFoundError: nvrtc found via was-already-loaded-from-elsewhere, cannot infer CUDA_HOME; original nvvm error: Failure finding "libnvvm.so": No such file: libnvvm.so*, No such file: libnvvm.so*

(build link)

Since RAPIDS has dropped Python 3.10 support in 26.04, I'm guessing that we're just getting a weird / untested mix of older nightlies and their dependencies. I've merged #850, which removes Python 3.10 here and will hopefully resolve that.

Rebasing this branch onto main should fix this issue.

@jameslamb jameslamb assigned jameslamb and AyodeAwe and unassigned jameslamb Feb 5, 2026
@AyodeAwe AyodeAwe force-pushed the main-merge-release/26.02 branch from e731c4f to 1d43a77 Compare February 11, 2026 16:10
Copy link
Member

@jameslamb jameslamb left a comment

Choose a reason for hiding this comment

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

This is not looking right, we've lost a commit here that is on release/26.02 but not main: 04a3808

At https://github.com/rapidsai/docker/pull/849/commits

Image

Compare to https://github.com/rapidsai/docker/commits/release/26.02/

Image

Comment on lines +73 to +74
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
EOF
Copy link
Member

Choose a reason for hiding this comment

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

This SHELL in the middle of this heredoc definitely is not right.

It looks to me like maybe you kept both parts of this git conflict? The full thing should look like this:

# --- begin 'rapidsai/miniforge-cuda' --- #
ARG CUDA_VER=notset
ARG LINUX_VER=notset
ARG PYTHON_VER=notset
ARG MINIFORGE_VER=notset

FROM condaforge/miniforge3:${MINIFORGE_VER} AS miniforge-upstream

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

COPY pinned /opt/conda/conda-meta/pinned

RUN \
  --mount=type=bind,source=scripts,target=/tmp/build-scripts \
<<EOF
  # update everything in 'base' before we copy files into later targets
  /tmp/build-scripts/update-base-conda-environment
EOF

################################ build miniforge-cuda using updated miniforge-upstream from above ###############################

Comment on lines +118 to +122
RUN <<EOF
# Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
chmod g+ws /opt/conda
EOF

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
RUN <<EOF
# Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
chmod g+ws /opt/conda
EOF

Remove this. On main, it's already done in configure-conda-base-environment which is called a few lines below.

# Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
chmod g+ws /opt/conda

@jameslamb
Copy link
Member

Replaced by #851

@jameslamb jameslamb closed this Feb 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants