Skip to content

Forward-merge branch-25.02 into branch-25.04#730

Closed
rapids-bot[bot] wants to merge 2 commits intobranch-25.04from
branch-25.02
Closed

Forward-merge branch-25.02 into branch-25.04#730
rapids-bot[bot] wants to merge 2 commits intobranch-25.04from
branch-25.02

Conversation

@rapids-bot
Copy link
Contributor

@rapids-bot rapids-bot bot commented Feb 3, 2025

Forward-merge triggered by push to branch-25.02 that creates a PR to keep branch-25.04 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

This updates to CUDA 12.8.0.

xref: rapidsai/build-planning#139

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Mike Sarahan (https://github.com/msarahan)

URL: #728
@rapids-bot rapids-bot bot requested a review from a team as a code owner February 3, 2025 16:29
@rapids-bot rapids-bot bot requested a review from jameslamb February 3, 2025 16:29
@rapids-bot
Copy link
Contributor Author

rapids-bot bot commented Feb 3, 2025

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

Working with @taureandyernv yesterday, we tried something like this to patch in a dependency at run time.

```shell
cat > ./environment.yml <<EOF
channels:
- dglteam/label/th23_cu121
dependencies:
- dgl
EOF

docker run \
  --rm \
  -v $(pwd)/environment.yml:/home/rapids/environment.yml \
  -it rapidsai/base:25.02a-cuda12.5-py3.12 \
  conda env export
```

Found that that prompts for confirmation:

```text
  Package           Version  Build    Channel                       Size
──────────────────────────────────────────────────────────────────────────
  Install:
──────────────────────────────────────────────────────────────────────────

  + dgl    2.4.0.th23.cu121  py312_0  dglteam/label/th23_cu121     295MB

  Summary:
  Install: 1 packages
  Total download: 295MB

──────────────────────────────────────────────────────────────────────────

Confirm changes: [Y/n]
```

But that prompt seems not to make it through to `mamba`.

And even if that did work, this interactive prompt prevents the use of the "mount in an `environment.yml`" approach in situations where you aren't running the container interactively... for example, where you want to use this image in a container in a Kubernetes Pod, and provide an `environment.yml` via a ConfigMap or file Secret.

This proposes skipping the confirmation and always running `mamba env update -y` when an `environment.yml` is provided.

## Notes for Reviewers

### How I tested this

Pulled an image built from this PR and confirmed that that install pattern described above works and does not prompt for interactive input.

```shell
cat > ./environment.yml <<EOF
channels:
- dglteam/label/th23_cu121
dependencies:
- dgl
EOF

docker run \
  --rm \
  -v $(pwd)/environment.yml:/home/rapids/environment.yml \
  -it rapidsai/staging:docker-727-25.02a-cuda12.5-py3.12 \
  conda env export
```

```text
...
  - dgl=2.4.0.th23.cu121=py312_0
...
```

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: #727
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.

2 participants