Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Backport #272063 to staging 23.11 #272336

Closed
wants to merge 24 commits into from
Closed

Backport #272063 to staging 23.11 #272336

wants to merge 24 commits into from

Conversation

SomeoneSerge
Copy link
Contributor

@SomeoneSerge SomeoneSerge commented Dec 5, 2023 •
edited
Loading

Description of changes

#272063 @NixOS/cuda-maintainers

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@SomeoneSerge
cudaPackagesGoogle: init, a package-set for jax and tf
5e0024e 
(cherry picked from commit 5bda2ec)
@SomeoneSerge
tensorrt: dont break eval for unrelated packages
0642188 
(cherry picked from commit 3ee37e4)
@SomeoneSerge
opensubdiv: drop the cudatoolkit.run file, and respect cudaFlags
09467c7 
(cherry picked from commit e5b174b)
@SomeoneSerge
blender: drop cudatoolkit.runfile
908d902 
(cherry picked from commit 2381384)
@SomeoneSerge
catboost: downgrade to cudaPackages_11 because of unsupported archite…
0cfec0f 
…ctures (compute_35)

(cherry picked from commit 5c2a368)
@SomeoneSerge
ctranslate2: fix the cuda 12 build
4d0bd79 
(cherry picked from commit 361d7da)
@SomeoneSerge
cudaPackages.cuda_nvcc: fix (getExe cuda_nvcc)
a5f0737 
(cherry picked from commit 6c63202)
@SomeoneSerge
cudaPackages_12.cutensor: init and fix
b172490 
(cherry picked from commit 0dc161b)
@SomeoneSerge
python3Packages.cupy: fix (use older cutensor)
5d21dd2 
(cherry picked from commit ee10810)
@SomeoneSerge
ucx: fix the cudaPackages_12 variant; drop the cudatoolkit runfile de…
c0cff83 
…pendency

(cherry picked from commit 58819d6)
@SomeoneSerge
gromacs: drop cudatoolkit.run
c4b7f28 
(cherry picked from commit 31f1b51)
@SomeoneSerge
openvino: opencvConfig.cmake attempts to find_package(CUDA)
d9fb272 
(cherry picked from commit 0c4b1fc)
@SomeoneSerge
nvidia-thrust: rm as deprecated
5284dc4 
The GitHub repo has been archived, the new thing is
[cccl](https://github.com/nvidia/cccl)

(cherry picked from commit 9cc210a)
@SomeoneSerge
ucc: drop the cudatoolkit runfile
ed45876 
(cherry picked from commit 3e37f3c)
@SomeoneSerge
ucc: respect cudaFlags
42bd848 
(cherry picked from commit 0f047c2)
@SomeoneSerge
openmpi: drop the cudatoolkit runfile
4338790 
(cherry picked from commit 4c6d2b8)
@SomeoneSerge
python311Packages.torchWithCuda: drop cuda_cudart.static at runtime
f0d5d28 
(cherry picked from commit 9d729f2)
@SomeoneSerge
cudaPackages.setupCudaHook: fix cudart flags
549f6f9 
(cherry picked from commit a7891f2)
@SomeoneSerge
cudaPackages.setupCudaHook: rewrite cudartFlags, remove infinite recu…
4621c03 
…rsion in cudatoolkit

We don't need to add the extra nvcc flags to locate cudart when using
cudatoolkit because it comes in the merged layout and nvcc doesn't have
any trouble locating dependencies in the same prefix

(cherry picked from commit 182e6b4)
@SomeoneSerge
cudaPackages_11_3.saxpy: fallback to the cudatoolkit runfile
3a92662 
(cherry picked from commit e084a6c)
@SomeoneSerge
cudaPackages.cuda_nvcc: fix hook's offsets (-1, -1) -> (-1, 0)
397867f 
Cf. explanations in NixOS#271078

(cherry picked from commit d031523)
@SomeoneSerge
cudaPackages.setupCudaHook: source only from nativeBuildInputs
cd88fe9 
(cherry picked from commit 37ec2cb)
@SomeoneSerge
tiny-cuda-nn: cuda_cccl required with the newer cuda
d619179 
(cherry picked from commit b9635cf)
@SomeoneSerge
tiny-cuda-nn: prune runtime closure
91bee7a 
(cherry picked from commit 18a2e51)
@ConnorBaker ConnorBaker added the 6.topic: cuda Parallel computing platform and API label Dec 5, 2023
@ConnorBaker ConnorBaker self-requested a review December 5, 2023 22:04
@veprbl
Copy link
Member

veprbl commented Dec 8, 2023

Please cherry pick #272964

@SomeoneSerge SomeoneSerge mentioned this pull request Dec 8, 2023
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ConnorBaker ConnorBaker Awaiting requested review from ConnorBaker

Assignees
No one assigned
Labels
6.topic: cuda Parallel computing platform and API 6.topic: python 8.has: clean-up 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
CUDA Team
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SomeoneSerge @veprbl @ConnorBaker