-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Backport 271078 to staging 23.11 #273040
Backport 271078 to staging 23.11 #273040
Conversation
pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh
Show resolved
Hide resolved
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)
c8287ce
to
d8ed2ba
Compare
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:-[]};
}" 🕐
|
pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh
Show resolved
Hide resolved
(cherry picked from commit a33ae59)
Just waiting for |
|
At a glance, I'd say that such large changes aren't even suitable for backporting to stable. |
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 |
For reference, target PR #279139 |
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 = relaxed
sandbox = true
nix-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.