cudaPackages: drop some runfile dependencies and fix a few builds #272063
Conversation
This file contains 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
SomeoneSerge
changed the title
SomeoneSerge
added
6.topic: cuda
SomeoneSerge
force-pushed
the
fix/cuda-upkeep
branch
from
b2f2013 to
fa086c5
Compare
|
I'm getting the following eval error from EDIT: I suspect it's because it references error:
… while querying the derivation named 'dcgm-3.2.5'
… while calling the 'getAttr' builtin
at /derivation-internal.nix:19:19:
18| value = commonAttrs // {
19| outPath = builtins.getAttr outputName strict;
| ^
20| drvPath = strict.drvPath;
… while calling the 'derivationStrict' builtin
at /derivation-internal.nix:9:12:
8|
9| strict = derivationStrict drvAttrs;
| ^
10|
… while evaluating derivation 'dcgm-3.2.5'
whose name attribute is located at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:348:7
… while evaluating attribute 'EXTRA_CUDA_PATHS' of derivation 'dcgm-3.2.5'
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix:98:3:
97| # Add our paths to the CUDA paths so FindCuda.cmake can find them.
98| EXTRA_CUDA_PATHS = lib.concatMapStringsSep "\n" mkAppendCudaPaths cudaPackageSetByVersion;
| ^
99| prePatch = ''
… from call site
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix:98:22:
97| # Add our paths to the CUDA paths so FindCuda.cmake can find them.
98| EXTRA_CUDA_PATHS = lib.concatMapStringsSep "\n" mkAppendCudaPaths cudaPackageSetByVersion;
| ^
99| prePatch = ''
… while calling 'concatMapStringsSep'
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/lib/strings.nix:117:5:
116| # List of input strings
117| list: concatStringsSep sep (map f list);
| ^
118|
… while calling 'mkAppendCudaPaths'
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix:65:23:
64| # Builds CMake code to add CUDA paths for include and lib.
65| mkAppendCudaPaths = { version, pkgSet }:
| ^
66| let
… while evaluating derivation 'cuda-combined-10'
whose name attribute is located at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:348:7
… while evaluating attribute 'paths' of derivation 'cuda-combined-10'
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix:74:9:
73| name = "cuda-combined-${version}";
74| paths = pkgSet;
| ^
75| };
… while evaluating derivation 'cudatoolkit-10.2.89'
whose name attribute is located at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:348:7
… while evaluating attribute 'depsTargetTargetPropagated' of derivation 'cudatoolkit-10.2.89'
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:403:7:
402| propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1;
403| depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0;
| ^
404|
… while evaluating derivation 'setup-cuda-hook'
whose name attribute is located at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:348:7
… while evaluating attribute 'cudartInclude' of derivation 'setup-cuda-hook'
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix:72:11:
71| # - the static library, which is in the static output
72| substitutions.cudartInclude = "${final.cuda_cudart.dev}";
| ^
73| substitutions.cudartLib = "${final.cuda_cudart.lib}";
error: attribute 'cuda_cudart' missing
at /home/connorbaker/.cache/nixpkgs-review/pr-272063/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix:72:44:
71| # - the static library, which is in the static output
72| substitutions.cudartInclude = "${final.cuda_cudart.dev}";
| ^
73| substitutions.cudartLib = "${final.cuda_cudart.lib}";
https://github.com/NixOS/nixpkgs/pull/272063 failed to build: Failed to list packages: nix-env failed with exit code 1 |
ofborg
bot
added
8.has: clean-up
8.has: package (new)
|
Oh it really does still use cuda10. Give me a moment Note that this is only an issue until we've merged https://github.com/NixOS/nixpkgs/blob/874916d667e60009055cf36c7d550b85e5008a48/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh#L102-L113 (just noticed a typo there, will fix) |
…ctures (compute_35)
The GitHub repo has been archived, the new thing is [cccl](https://github.com/nvidia/cccl)
SomeoneSerge
force-pushed
the
fix/cuda-upkeep
branch
from
0993f09 to
0bb153b
Compare
|
From the commit message: cudaPackages.setupCudaHook: rewrite cudartFlags, remove infinite recu… We don't need to add the extra nvcc flags to locate cudart when using |
13 tasks
|
Result of 47 packages marked as broken and skipped:
46 packages failed to build:
544 packages built:
|
|
|
Logs are available here: https://drive.google.com/drive/folders/1GgABhwa2ooKeZXMqf5He6PcyClNrE6cQ?usp=share_link Log archive: Result of 47 packages marked as broken and skipped:
46 packages failed to build:
544 packages built:
|
ConnorBaker
previously requested changes
Dec 5, 2023
pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh
Outdated
Show resolved
Hide resolved
ConnorBaker
reviewed
Dec 5, 2023
SomeoneSerge
force-pushed
the
fix/cuda-upkeep
branch
from
c820794 to
aec21f1
Compare
…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
Cf. explanations in NixOS#271078
SomeoneSerge
force-pushed
the
fix/cuda-upkeep
branch
from
aec21f1 to
18a2e51
Compare
ConnorBaker
approved these changes
Dec 5, 2023
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin staging-23.11
git worktree add -d .worktree/backport-272063-to-staging-23.11 origin/staging-23.11
cd .worktree/backport-272063-to-staging-23.11
git switch --create backport-272063-to-staging-23.11
git cherry-pick -x 5bda2ec626a4107f8adc3a7e58c16c0594c40d2c 3ee37e4356ef08d0a4b872e76031983288e40a80 e5b174bedb0af5f8da2be151f241b6d0174f6bfb 238138417344ba277e80ed451ce5f80f47dd86f2 5c2a368f87f0f3b0585255aaa5a2d1547da4c29c 361d7da37f7bb945a026cb15dcb5ec548bf87e95 6c63202052bb23151ca77b613357c790c5542e42 0dc161b2f806aa3d9dd7bee4f3dbb5289bc98eeb ee108108fcbe21999ecc1f36ac730c15376dc824 58819d631edc8ffa5658ef025e1b1c04903cc43f 31f1b517cdea429dc7a6c212ca650ea184c75a93 0c4b1fcfba531c8f33b416583053df2582a6843e 9cc210a7839f4e2aeb13bcadc96981daf8bc6501 3e37f3c9836da7cf6dd2c3d66a442cd8c74113b3 0f047c2372f2ebfaf67fad4aaacc131f5d879583 4c6d2b81cf4dd94398a6fc5b3727c685b439f4b3 9d729f260d023569a20c4339776e6b442a9f588c a7891f2adaf409a95b2c0d8e373270993951e69d 182e6b41d08d37c8eb817212b88b37b671abfb22 e084a6c648fecd473ff6190a5acac3369b292530 d031523a012688079e3bef68abaab2f8c5d099af 37ec2cb6b173c7d5b78ec704db533454f9bc84ba b9635cfa4d659ca652ab4c400988d6c8b1e453c0 18a2e518cdcef0764cfd7a96c39fdc0e7874e9fd |
This was referenced Dec 5, 2023
|
I think I cannot build blender without cuda after this PR. |
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
A bunch of fixes aggregated from #271078 and #269639. Idk the other two PRs are going to be merged, but this specific diff should be mostly a no-brainer
@NixOS/cuda-maintainers
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.