Resolve forward merge conflicts#732
Merged
AyodeAwe merged 3 commits intorapidsai:branch-25.04from Feb 12, 2025
Merged
Conversation
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: rapidsai#728
…idsai#727) 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: rapidsai#727
# Conflicts: # cuvs-bench/README.md # dockerhub-readme.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge
branch-25.02intobranch-25.04, resolves #730Do NOT squash merge!