From 4938f79c957da16f356cf2d3e7105abd97f594be Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Mon, 12 May 2025 19:30:16 +0000 Subject: [PATCH] tree-wide: cudaPackages.cudaFlags -> cudaPackages.flags Signed-off-by: Connor Baker --- pkgs/applications/science/misc/colmap/default.nix | 4 ++-- pkgs/by-name/gp/gpu-burn/package.nix | 2 +- pkgs/by-name/ko/koboldcpp/package.nix | 2 +- pkgs/by-name/mi/mistral-rs/package.nix | 4 ++-- pkgs/by-name/mo/moshi/package.nix | 4 ++-- pkgs/by-name/ol/ollama/package.nix | 2 +- pkgs/by-name/on/onnxruntime/package.nix | 2 +- pkgs/by-name/op/opensubdiv/package.nix | 2 +- pkgs/by-name/uc/ucc/package.nix | 4 ++-- pkgs/development/cuda-modules/aliases.nix | 5 +++++ pkgs/development/cuda-modules/packages/nccl.nix | 6 +++--- pkgs/development/libraries/opencv/4.x.nix | 3 +-- pkgs/development/python-modules/jaxlib/default.nix | 4 ++-- pkgs/development/python-modules/tensorflow/bin.nix | 2 +- .../development/python-modules/tensorflow/default.nix | 2 +- .../python-modules/torch/source/default.nix | 8 ++++---- pkgs/development/python-modules/vllm/default.nix | 11 +++++------ pkgs/top-level/cuda-packages.nix | 3 --- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 6566d38b4ef7..c28c1b15b96e 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -20,7 +20,7 @@ qt5, xorg, cudaSupport ? config.cudaSupport, - cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities, + cudaCapabilities ? cudaPackages.flags.cudaCapabilities, cudaPackages, }: @@ -46,7 +46,7 @@ stdenv'.mkDerivation rec { cmakeFlags = lib.optionals cudaSupport [ (lib.cmakeBool "CUDA_ENABLED" true) (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( - lib.strings.concatStringsSep ";" (map cudaPackages.cudaFlags.dropDot cudaCapabilities) + lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDot cudaCapabilities) )) ]; diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix index d2b2bd45ea3a..2028427c96c1 100644 --- a/pkgs/by-name/gp/gpu-burn/package.nix +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -17,7 +17,7 @@ let cuda_nvcc libcublas ; - inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot isJetsonBuild; + inherit (cudaPackages.flags) cudaCapabilities dropDot isJetsonBuild; in backendStdenv.mkDerivation { pname = "gpu-burn"; diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index c79ae4a3475e..7b8acf13820a 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -17,7 +17,7 @@ cublasSupport ? config.cudaSupport, # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ # For example if you're on an RTX 3060 that means you're using "Ampere" and you need to pass "sm_86" - cudaArches ? cudaPackages.cudaFlags.realArches or [ ], + cudaArches ? cudaPackages.flags.realArches or [ ], clblastSupport ? stdenv.hostPlatform.isLinux, clblast, diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 8151df791ec4..18d3eccf6e3f 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -49,7 +49,7 @@ let (acceleration == "cuda") || (config.cudaSupport && acceleration == null); minRequiredCudaCapability = "6.1"; # build fails with 6.0 - inherit (cudaPackages.cudaFlags) cudaCapabilities; + inherit (cudaPackages.flags) cudaCapabilities; cudaCapabilityString = if cudaCapability == null then (builtins.head ( @@ -60,7 +60,7 @@ let )) else cudaCapability; - cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); + cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString); mklSupport = assert accelIsValid; diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix index ed683e799bf0..94fd6af59326 100644 --- a/pkgs/by-name/mo/moshi/package.nix +++ b/pkgs/by-name/mo/moshi/package.nix @@ -27,7 +27,7 @@ let minRequiredCudaCapability = "6.1"; # build fails with 6.0 - inherit (cudaPackages.cudaFlags) cudaCapabilities; + inherit (cudaPackages.flags) cudaCapabilities; cudaCapabilityString = if cudaCapability == null then (builtins.head ( @@ -38,7 +38,7 @@ let )) else cudaCapability; - cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); + cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString); in rustPlatform.buildRustPackage (finalAttrs: { pname = "moshi"; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 131bade17ab1..56b6a44fc618 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -16,7 +16,7 @@ rocmPackages, rocmGpuTargets ? rocmPackages.clr.localGpuTargets or (rocmPackages.clr.gpuTargets or [ ]), cudaPackages, - cudaArches ? cudaPackages.cudaFlags.realArches or [ ], + cudaArches ? cudaPackages.flags.realArches or [ ], autoAddDriverRunpath, # passthru diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 5c8830ee24fc..71891ad7f149 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -98,7 +98,7 @@ let hash = "sha256-YJdZ0cMtUncH5Z6TtAWBH0xtAIu2UcbjnVcCM4tfg20="; }; - isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; + isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild; in effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 8d42b97d3640..9eedd8f19430 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/PixarAnimationStudios/OpenSubdiv/blob/7d0ab5530feef693ac0a920585b5c663b80773b3/CMakeLists.txt#L602 preConfigure = lib.optionalString cudaSupport '' cmakeFlagsArray+=( - -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.cudaFlags.gencode}" + -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.flags.gencode}" ) ''; diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix index 79930ce764f4..793cfb515e23 100644 --- a/pkgs/by-name/uc/ucc/package.nix +++ b/pkgs/by-name/uc/ucc/package.nix @@ -24,7 +24,7 @@ let cuda_cudart cuda_nvcc cuda_nvml_dev - cudaFlags + flags nccl ; @@ -101,7 +101,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals enableAvx [ "--with-avx" ] ++ optionals enableCuda [ "--with-cuda=${cuda_nvcc}" - "--with-nvcc-gencode=${concatStringsSep " " cudaFlags.gencode}" + "--with-nvcc-gencode=${concatStringsSep " " flags.gencode}" ]; postInstall = '' diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index b2bbaf68a33c..14975410d378 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -9,6 +9,11 @@ in builtins.mapAttrs mkRenamed { # A comment to prevent empty { } from collapsing into a single line + cudaFlags = { + path = "cudaPackages.flags"; + package = final.flags; + }; + cudaVersion = { path = "cudaPackages.cudaMajorMinorVersion"; package = final.cudaMajorMinorVersion; diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix index 1b422fdbfe8c..a469f9602742 100644 --- a/pkgs/development/cuda-modules/packages/nccl.nix +++ b/pkgs/development/cuda-modules/packages/nccl.nix @@ -18,9 +18,9 @@ let cuda_cudart cuda_nvcc cudaAtLeast - cudaFlags cudaOlder cudatoolkit + flags ; # versions 2.26+ with CUDA 11.x error with # fatal error: cuda/atomic: No such file or directory @@ -87,7 +87,7 @@ backendStdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" - "NVCC_GENCODE=${cudaFlags.gencodeString}" + "NVCC_GENCODE=${flags.gencodeString}" ] ++ lib.optionals (cudaOlder "11.4") [ "CUDA_HOME=${cudatoolkit}" @@ -118,7 +118,7 @@ backendStdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication. # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9 - badPlatforms = lib.optionals cudaFlags.isJetsonBuild [ "aarch64-linux" ]; + badPlatforms = lib.optionals flags.isJetsonBuild [ "aarch64-linux" ]; maintainers = with maintainers; [ mdaiter orivej diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 070285bd473a..dd62e5398981 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -274,8 +274,7 @@ let #https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) cudaFlags; - inherit (cudaFlags) cmakeCudaArchitecturesString cudaCapabilities; + inherit (cudaPackages.flags) cmakeCudaArchitecturesString cudaCapabilities; in diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index e54c27d317ed..37030e69f531 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -52,8 +52,8 @@ let inherit (cudaPackages) - cudaFlags cudaMajorMinorVersion + flags nccl ; @@ -319,7 +319,7 @@ let build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnnMerged},${lib.getDev nccl}" build --action_env TF_CUDA_VERSION="${cudaMajorMinorVersion}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudaPackages.cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," flags.realArches}" '' + # Note that upstream conditions this on `wheel_cpu == "x86_64"`. We just diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index f8476a2f1821..4057bfea3be7 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -53,7 +53,7 @@ let packages = import ./binary-hashes.nix; inherit (cudaPackages) cudatoolkit cudnn; - isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; + isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild; in buildPythonPackage rec { pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 7c67fbd8792a..c9d3eb0ac79e 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -70,7 +70,7 @@ config, cudaSupport ? config.cudaSupport, cudaPackages, - cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities, + cudaCapabilities ? cudaPackages.flags.cudaCapabilities, mklSupport ? false, mkl, tensorboardSupport ? true, diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 05df9deab01c..fc103d81d60e 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -114,7 +114,7 @@ let strings trivial ; - inherit (cudaPackages) cudaFlags cudnn nccl; + inherit (cudaPackages) cudnn flags nccl; triton = throw "python3Packages.torch: use _tritonEffective instead of triton to avoid divergence"; @@ -152,10 +152,10 @@ let # lists.subtractLists a b = b - a # For CUDA - supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities; - unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities; + supportedCudaCapabilities = lists.intersectLists flags.cudaCapabilities supportedTorchCudaCapabilities; + unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities flags.cudaCapabilities; - isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; + isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild; # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. gpuArchWarner = diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 973268de510b..c17eb4c11ccf 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -77,7 +77,7 @@ let trivial ; - inherit (cudaPackages) cudaFlags; + inherit (cudaPackages) flags; shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; @@ -179,10 +179,10 @@ let # lists.subtractLists a b = b - a # For CUDA - supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities; - unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities; + supportedCudaCapabilities = lists.intersectLists flags.cudaCapabilities supportedTorchCudaCapabilities; + unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities flags.cudaCapabilities; - isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild; + isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild; # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. gpuArchWarner = @@ -376,8 +376,7 @@ buildPythonPackage rec { ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}") - (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.cudaFlags.cmakeCudaArchitecturesString - }") + (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.flags.cmakeCudaArchitecturesString}") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin { name = "cuda-merged-${cudaPackages.cudaMajorMinorVersion}"; paths = builtins.concatMap getAllOutputs mergedCudaLibraries; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index d0d64f69dc71..740efe03b346 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -82,9 +82,6 @@ let __attrsFailEvaluation = true; }; - # TODO(@connorbaker): `cudaFlags` is an alias for `flags` which should be removed in the future. - cudaFlags = flags; - # Loose packages # Barring packages which share a home (e.g., cudatoolkit and cudatoolkit-legacy-runfile), new packages # should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically