tree-wide: use named CUDA versions and CUDA version utilities (#405664)

Author: ConnorBaker

pkgs/by-name/ca/catboost/package.nix

@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     shopt -s globstar
     for cmakelists in **/CMakeLists.*; do
       sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists
-      ${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") ''
+      ${lib.optionalString (cudaPackages.cudaOlder "11.8") ''
         sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists
         sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists
       ''}

pkgs/by-name/ti/tiny-cuda-nn/package.nix

@@ -13,7 +13,7 @@
 }:
 let
   inherit (lib) lists strings;
-  inherit (cudaPackages) backendStdenv cudaVersion flags;
+  inherit (cudaPackages) backendStdenv cudaAtLeast flags;
 
   cuda-common-redist = with cudaPackages; [
     (lib.getDev cuda_cudart) # cuda_runtime.h
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Remove this once a release is made with
   # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1
-  postPatch = lib.optionals (strings.versionAtLeast cudaVersion "11.0") ''
+  postPatch = lib.optionals (cudaAtLeast "11.0") ''
     substituteInPlace bindings/torch/setup.py --replace-fail \
       "-std=c++14" "-std=c++17"
   '';

pkgs/development/cuda-modules/aliases.nix

@@ -1,14 +1,16 @@
 # Packages which have been deprecated or removed from cudaPackages
-final: prev:
+final: _:
 let
-  inherit (prev.lib) warn;
-  inherit (builtins) mapAttrs;
-
   mkRenamed =
     oldName:
     { path, package }:
-    warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
+    final.lib.warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
 in
-mapAttrs mkRenamed {
+builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
+
+  cudaVersion = {
+    path = "cudaPackages.cudaMajorMinorVersion";
+    package = final.cudaMajorMinorVersion;
+  };
 }

pkgs/development/cuda-modules/cuda-samples/extension.nix

@@ -1,5 +1,5 @@
 {
-  cudaVersion,
+  cudaMajorMinorVersion,
   lib,
   stdenv,
 }:
@@ -27,7 +27,7 @@ let
 
   # Samples are built around the CUDA Toolkit, which is not available for
   # aarch64. Check for both CUDA version and platform.
-  cudaVersionIsSupported = cudaVersionToHash ? ${cudaVersion};
+  cudaVersionIsSupported = cudaVersionToHash ? ${cudaMajorMinorVersion};
   platformIsSupported = hostPlatform.isx86_64;
   isSupported = cudaVersionIsSupported && platformIsSupported;
 
@@ -36,8 +36,7 @@ let
     final: _:
     lib.attrsets.optionalAttrs isSupported {
       cuda-samples = final.callPackage ./generic.nix {
-        inherit cudaVersion;
-        hash = cudaVersionToHash.${cudaVersion};
+        hash = cudaVersionToHash.${cudaMajorMinorVersion};
       };
     };
 in

pkgs/development/cuda-modules/cuda-samples/generic.nix

@@ -3,7 +3,7 @@
   backendStdenv,
   cmake,
   cudatoolkit,
-  cudaVersion,
+  cudaMajorMinorVersion,
   fetchFromGitHub,
   fetchpatch,
   freeimage,
@@ -20,7 +20,7 @@ backendStdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   pname = "cuda-samples";
-  version = cudaVersion;
+  version = cudaMajorMinorVersion;
 
   src = fetchFromGitHub {
     owner = "NVIDIA";

pkgs/development/cuda-modules/cuda/extension.nix

@@ -1,4 +1,4 @@
-{ cudaVersion, lib }:
+{ cudaMajorMinorVersion, lib }:
 let
   inherit (lib) attrsets modules trivial;
   redistName = "cuda";
@@ -23,10 +23,10 @@ let
   };
 
   # Check if the current CUDA version is supported.
-  cudaVersionMappingExists = builtins.hasAttr cudaVersion cudaVersionMap;
+  cudaVersionMappingExists = builtins.hasAttr cudaMajorMinorVersion cudaVersionMap;
 
   # fullCudaVersion : String
-  fullCudaVersion = cudaVersionMap.${cudaVersion};
+  fullCudaVersion = cudaVersionMap.${cudaMajorMinorVersion};
 
   evaluatedModules = modules.evalModules {
     modules = [

pkgs/development/cuda-modules/cudatoolkit/default.nix

@@ -1,5 +1,5 @@
 {
-  cudaVersion,
+  cudaMajorMinorVersion,
   runPatches ? [ ],
   autoPatchelfHook,
   autoAddDriverRunpath,
@@ -54,7 +54,7 @@
 let
   # Version info for the classic cudatoolkit packages that contain everything that is in redist.
   releases = builtins.import ./releases.nix;
-  release = releases.${cudaVersion};
+  release = releases.${cudaMajorMinorVersion};
 in
 
 backendStdenv.mkDerivation rec {

pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix

@@ -4,7 +4,7 @@
   backendStdenv,
   cudaOlder,
   cudatoolkit-legacy-runfile,
-  cudaVersion,
+  cudaMajorMinorVersion,
   cuda_cccl ? null,
   cuda_cudart ? null,
   cuda_cuobjdump ? null,
@@ -66,8 +66,8 @@ if cudaOlder "11.4" then
   cudatoolkit-legacy-runfile
 else
   symlinkJoin rec {
-    name = "cuda-merged-${cudaVersion}";
-    version = cudaVersion;
+    name = "cuda-merged-${cudaMajorMinorVersion}";
+    version = cudaMajorMinorVersion;
 
     paths = builtins.concatMap getAllOutputs allPackages;
 

pkgs/development/cuda-modules/cusparselt/extension.nix

@@ -3,7 +3,7 @@
 {
   lib,
   stdenv,
-  cudaVersion,
+  cudaMajorMinorVersion,
   flags,
   mkVersionedPackageName,
 }:
@@ -54,15 +54,6 @@ let
       releaseGrabber
     ]) cusparseltVersions;
 
-  # Our cudaVersion tells us which version of CUDA we're building against.
-  # The subdirectories in lib/ tell us which versions of CUDA are supported.
-  # Typically the names will look like this:
-  #
-  # - 10.2
-  # - 11
-  # - 11.0
-  # - 12
-
   # A release is supported if it has a libPath that matches our CUDA version for our platform.
   # LibPath are not constant across the same release -- one platform may support fewer
   # CUDA versions than another.

pkgs/development/cuda-modules/cutensor/extension.nix

@@ -13,7 +13,7 @@
 # - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib`
 #   -- one for each version of CUDA.
 {
-  cudaVersion,
+  cudaMajorMinorVersion,
   flags,
   lib,
   mkVersionedPackageName,
@@ -73,7 +73,7 @@ let
       releaseGrabber
     ]) cutensorVersions;
 
-  # Our cudaVersion tells us which version of CUDA we're building against.
+  # Our cudaMajorMinorVersion tells us which version of CUDA we're building against.
   # The subdirectories in lib/ tell us which versions of CUDA are supported.
   # Typically the names will look like this:
   #
@@ -85,10 +85,9 @@ let
   # libPath :: String
   libPath =
     let
-      cudaMajorMinor = versions.majorMinor cudaVersion;
-      cudaMajor = versions.major cudaVersion;
+      cudaMajorVersion = versions.major cudaMajorMinorVersion;
     in
-    if cudaMajorMinor == "10.2" then cudaMajorMinor else cudaMajor;
+    if cudaMajorMinorVersion == "10.2" then cudaMajorMinorVersion else cudaMajorVersion;
 
   # A release is supported if it has a libPath that matches our CUDA version for our platform.
   # LibPath are not constant across the same release -- one platform may support fewer