dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #331017 from srhb/drop-cuda-aliases

Browse Source 
cudaPackages: drop outdated aliases
This commit is contained in:
Someone 2024-07-31 14:43:01 +03:00 committed by GitHub
commit 5cc4b22d5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/cuda-modules/aliases.nix
View File

@ -1,18 +1,14 @@
# Packges which have been deprecated or removed from cudaPackages
# Packages which have been deprecated or removed from cudaPackages
final: prev:
let
mkRenamed =
oldName: newName: newPkg:
final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg;
in
{
inherit (prev.lib) warn;
inherit (builtins) mapAttrs;
# Deprecated: an alias kept for compatibility. Consider removing after 24.05
autoFixElfFiles = mkRenamed "autoFixElfFiles" "pkgs.autoFixElfFiles" final.pkgs.autoFixElfFiles; # Added 2024-03-30
autoAddDriverRunpath =
mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath"
final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
autoAddOpenGLRunpathHook =
mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpathHook"
final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
mkRenamed =
oldName:
{ path, package }:
warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
in
mapAttrs mkRenamed {
# A comment to prevent empty { } from collapsing into a single line
}

5
pkgs/development/python-modules/torch/default.nix
View File

@ -201,8 +201,11 @@ let
]);
"MPI cudatoolkit does not match cudaPackages.cudatoolkit" =
MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit);
# This used to be a deep package set comparison between cudaPackages and
# effectiveMagma.cudaPackages, making torch too strict in cudaPackages.
# In particular, this triggered warnings from cuda's `aliases.nix`
"Magma cudaPackages does not match cudaPackages" =
cudaSupport && (effectiveMagma.cudaPackages != cudaPackages);
cudaSupport && (effectiveMagma.cudaPackages.cudaVersion != cudaPackages.cudaVersion);
"Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport;
};
in