Skip to content

cudaPackages.cuda_nvcc: patch nvcc.profile#275922

Merged
SomeoneSerge merged 3 commits intoNixOS:masterfrom
SomeoneSerge:fix/cuda-nvcc-profile
Dec 23, 2023
Merged

cudaPackages.cuda_nvcc: patch nvcc.profile#275922
SomeoneSerge merged 3 commits intoNixOS:masterfrom
SomeoneSerge:fix/cuda-nvcc-profile

Conversation

@SomeoneSerge
Copy link
Contributor

let nvcc know about cudart and the stub drivers; this way we do not need to search for cudart in the setupCudaHook. This shouldn't (I hope) matter for cudaPackages.cudatoolkit because it's got its merged layout

@NixOS/cuda-maintainers

Description of changes

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 SomeoneSerge added the 6.topic: cuda Parallel computing platform and API label Dec 22, 2023
@ofborg ofborg bot requested review from ConnorBaker and samuela December 22, 2023 01:26
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Dec 22, 2023
let nvcc know about cudart and the stub drivers; this way
we do not need to search for cudart in the setupCudaHook
This makes @ccroot@ in setupCudaHook redundant when used with
the redist cuda packages. We do not touch setupCudaHook yet,
because we still have to address the deprecated cudaPackages.cudatoolkit
Copy link
Member

@samuela samuela left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM

@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Dec 22, 2023
@SomeoneSerge
Copy link
Contributor Author

Thanks @samuela! I've a few more commits that move this into a separate hook and apply it to cudatoolkit in addition to cuda_nvcc but they're not ready so I'll just merge this so the CI picks this up and we start testing

@SomeoneSerge SomeoneSerge merged commit 8fc12bc into NixOS:master Dec 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cuda Parallel computing platform and API 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

3 participants