Backport 271078 to staging 23.11#273040
Merged
ConnorBaker merged 38 commits intoNixOS:staging-23.11from Dec 15, 2023
Merged
Conversation
github-actions
bot
added
the
6.topic: python
SomeoneSerge
commented
Dec 9, 2023
pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh
Outdated
Show resolved
Hide resolved
ofborg
bot
added
8.has: clean-up
This was referenced Dec 11, 2023
Contributor
Author
|
I should probably reorder the commits so that blender won't be broken in the intermediate commits either |
(cherry picked from commit e5b174b)
(cherry picked from commit 3b2e32b)
also fix the incompatible gcc error by adding cuda_nvcc to nativeBuildInputs (cudaPackages.cudatoolkit in buildInputs is insufficient because that doesn't propagate the hook) (cherry picked from commit 7c97d5f)
(cherry picked from commit 5bda2ec)
(cherry picked from commit 3ee37e4)
(cherry picked from commit 2381384)
…ctures (compute_35) (cherry picked from commit 5c2a368)
(cherry picked from commit 361d7da)
(cherry picked from commit 6c63202)
(cherry picked from commit 0dc161b)
(cherry picked from commit ee10810)
…pendency (cherry picked from commit 58819d6)
(cherry picked from commit 31f1b51)
(cherry picked from commit 0c4b1fc)
The GitHub repo has been archived, the new thing is [cccl](https://github.com/nvidia/cccl) (cherry picked from commit 9cc210a)
(cherry picked from commit 3e37f3c)
(cherry picked from commit 0f047c2)
(cherry picked from commit 4c6d2b8)
(cherry picked from commit 9d729f2)
(cherry picked from commit a7891f2)
(cherry picked from commit 37ec2cb)
(cherry picked from commit b9635cf)
(cherry picked from commit 18a2e51)
This is useful for the cuda variants of packages like opencv and pytorch, whose xxxxConfig.cmake files do find_package(CUDAToolkit REQUIRED) regardless of whether they actually use it. With the propagated hook, we no longer have to manually add cuda dependencies into torch/opencvs reverse dependencies cudaPackages.cuda_nvcc: fix setupCudaHook propagation (cherry picked from commit be9c779)
(cherry picked from commit ada3991)
(cherry picked from commit 4569838)
(cherry picked from commit 55af932)
(cherry picked from commit 71c248e)
(cherry picked from commit 3ececb9)
(cherry picked from commit 44611c4)
(cherry picked from commit 2df7ccf)
(cherry picked from commit 807a4c7)
…rectly (cherry picked from commit 8105992)
SomeoneSerge
force-pushed
the
backport-271078-to-staging-23.11
branch
from
c8287ce to
d8ed2ba
Compare
13 tasks
Contributor
|
Note Template PR=273040; \
SYSTEM="aarch64-linux"; \
CUDA_SUPPORT="true"; \
CUDA_CAPABILITIES='[ "7.5" ]'; \
nixpkgs-review pr "$PR" \
--system "$SYSTEM" \
--no-shell \
--checkout commit \
--allow aliases \
--build-args "--max-jobs 1" \
--extra-nixpkgs-config "{
allowUnfree = true;
allowBroken = false;
cudaSupport = ${CUDA_SUPPORT:-false};
cudaCapabilities = ${CUDA_CAPABILITIES:-[]};
}"🕐
|
ConnorBaker
reviewed
Dec 13, 2023
pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh
Outdated
Show resolved
Hide resolved
13 tasks
(cherry picked from commit a33ae59)
ConnorBaker
approved these changes
Dec 15, 2023
Contributor
|
Just waiting for |
Member
|
|
Member
|
At a glance, I'd say that such large changes aren't even suitable for backporting to stable. |
Contributor
Author
|
Cctag definitely was affected by the opencvConfig issue on master at the time, as were two dozen other cudaSupport=true packages in the release branch (link tbd, writing from a mobile). The backport is huge partly because I tried to merge and reorder fixes from several correlated PRs. I'll look into the hydra failure, thx |
Member
|
For reference, target PR #279139 |
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
6 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.
Description of changes
Supersedes #272336. Incorporates #272063, #273048, #272964 and #272812
This probably goes into staging before #272784
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.