Unverified Commit 5cc4b22d authored by Someone's avatar Someone Committed by GitHub
Browse files

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

cudaPackages: drop outdated aliases
parents 301c3bf4 2a94466c

pkgs/development/cuda-modules/aliases.nix

+9 −13
Original line number Diff line number Diff line 
# 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

}

pkgs/development/python-modules/torch/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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