Skip to content

cudaPackages: drop outdated aliases #331017

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

Merged
SomeoneSerge merged 2 commits into from
Jul 31, 2024
Merged

cudaPackages: drop outdated aliases #331017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb429ba
cuda-modules: remove old aliases
srhb Jul 30, 2024
2a94466
torch: do not deep-compare cudaPackages
srhb Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions pkgs/development/cuda-modules/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
inherit (prev.lib) warn;
inherit (builtins) mapAttrs;

mkRenamed =
oldName: newName: newPkg:
final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg;
oldName:
{ path, package }:
warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
in
{

# 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
mapAttrs mkRenamed {
# A comment to prevent empty { } from collapsing into a single line
}
5 changes: 4 additions & 1 deletion pkgs/development/python-modules/torch/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,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
Expand Down