diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bfc42d8c06be..09cde5a9cdaf 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -110,7 +110,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableMpi [ mpi ] ++ lib.optionals enableCuda [ - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index 197137aa33d9..347904227bf2 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.libcublas ]; diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index 5838cd4540fb..812a6d88286f 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -84,7 +84,7 @@ stdenv'.mkDerivation (finalAttrs: { mkl ] ++ lib.optionals withCUDA [ - cudaPackages.cuda_cccl # required by the fp16 headers in cudart + cudaPackages.cccl # required by the fp16 headers in cudart cudaPackages.cuda_cudart cudaPackages.libcublas cudaPackages.libcurand diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 8c823615b1ef..78240426d56c 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -37,7 +37,7 @@ let # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/scripts/0080_cuda.sh#L24-L39 getCudaPackages = p: with p; [ - cuda_cccl + cccl cuda_cudart cuda_nvcc cuda_nvml_dev diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix index a7c802197ac2..2f6626069135 100644 --- a/pkgs/by-name/dl/dlib/package.nix +++ b/pkgs/by-name/dl/dlib/package.nix @@ -76,7 +76,7 @@ libcurand libcusolver cudnn - cuda_cccl + cccl ] ); diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix index 2f1d23c5089e..749fdbf20f8a 100644 --- a/pkgs/by-name/fa/faiss/package.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -31,10 +31,10 @@ let stdenv = if cudaSupport then backendStdenv else inputs.stdenv; cudaComponents = with cudaPackages; [ + cccl cuda_cudart # cuda_runtime.h libcublas libcurand - cuda_cccl # cuda_profiler_api.h (cudaPackages.cuda_profiler_api or cudaPackages.cuda_nvprof) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 98d01f664f68..a10dc4997729 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl + cccl cuda_cudart libcublas ] diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix index a14f33d306f0..5bd0b81d1878 100644 --- a/pkgs/by-name/gp/gpu-burn/package.nix +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -12,7 +12,7 @@ let inherit (config) cudaSupport; inherit (cudaPackages) backendStdenv - cuda_cccl + cccl cuda_cudart cuda_nvcc libcublas @@ -49,7 +49,7 @@ backendStdenv.mkDerivation { ]; buildInputs = [ - cuda_cccl # + cccl # cuda_cudart # driver_types.h cuda_nvcc # crt/host_defines.h libcublas # cublas_v2.h diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix index 30b113517c8d..a4e3452116c1 100644 --- a/pkgs/by-name/ka/katago/package.nix +++ b/pkgs/by-name/ka/katago/package.nix @@ -78,7 +78,7 @@ stdenv'.mkDerivation rec { ++ lib.optionals (backend == "cuda") ( with cudaPackages; [ - cuda_cccl + cccl cuda_cudart cuda_nvcc cudnn diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 47cd45aa47ee..0d6a48410f73 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -74,7 +74,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { cudaPackages.libcublas cudaPackages.cuda_nvcc cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl ] ++ lib.optionals clblastSupport [ clblast diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index a08d157bee7c..7a01d5d513b6 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -59,7 +59,7 @@ let ; cudaBuildInputs = with cudaPackages; [ - cuda_cccl # + cccl # # A temporary hack for reducing the closure size, remove once cudaPackages # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 diff --git a/pkgs/by-name/ll/llrCUDA/package.nix b/pkgs/by-name/ll/llrCUDA/package.nix index 1630f0d3e126..bcb3ad1f6cc5 100644 --- a/pkgs/by-name/ll/llrCUDA/package.nix +++ b/pkgs/by-name/ll/llrCUDA/package.nix @@ -39,7 +39,7 @@ backendStdenv.mkDerivation (finalAttrs: { gmp cudaPackages.cuda_cudart cudaPackages.libcufft - cudaPackages.cuda_cccl + cudaPackages.cccl ]; env = { diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 7e1d70a13530..6d385a0c0fc9 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -77,7 +77,7 @@ let inherit (cudaPackages) libcublas cuda_nvcc - cuda_cccl + cccl cuda_cudart libcufft ; @@ -255,7 +255,7 @@ let buildInputs = [ ] ++ lib.optionals with_cublas [ - cuda_cccl + cccl cuda_cudart libcublas libcufft diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 92ec9065cdb9..16343ec424a5 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -44,7 +44,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # cub/cub.cuh + cccl # cub/cub.cuh libcublas # cublas_v2.h libcurand # curand.h libcusparse # cusparse.h diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 6692daa5419d..14cc604059bc 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # cub/cub.cuh + cccl # cub/cub.cuh libcublas # cublas_v2.h libcurand # curand.h libcusparse # cusparse.h diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index dbf04424be14..55291c6a0ee0 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lists.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # and + cccl # and cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h libcusparse # cusparse.h diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 88733f003905..af7a37c95d62 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix index 51680a5818d5..0c01238ae534 100644 --- a/pkgs/by-name/mm/mmseqs2/package.nix +++ b/pkgs/by-name/mm/mmseqs2/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMpi mpi ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl ]; postInstall = '' diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix index 9b4b90df7da5..964f47f06c9d 100644 --- a/pkgs/by-name/mo/moshi/package.nix +++ b/pkgs/by-name/mo/moshi/package.nix @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { alsa-lib ] ++ lib.optionals config.cudaSupport [ - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 853e7ef721c0..b66a4af42253 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -82,7 +82,7 @@ let cudaLibs = [ cudaPackages.cuda_cudart cudaPackages.libcublas - cudaPackages.cuda_cccl + cudaPackages.cccl ]; vulkanLibs = [ @@ -102,7 +102,7 @@ let (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) ]; - # cuda_cccl and cuda_cudart both have a LICENSE file in their output + # cccl and cuda_cudart both have a LICENSE file in their output ignoreCollisions = true; }; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 527597381ede..4253d258d8b2 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -205,7 +205,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # cub/cub.cuh + cccl # cub/cub.cuh libcublas # cublas_v2.h libcurand # curand.h libcusparse # cusparse.h diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index 1a94fc54f52b..e6b1a921e519 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl ]; cmakeFlags = [ diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix index 198b82c0f8ed..d0938ebf8f1f 100644 --- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix +++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix @@ -71,7 +71,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (optionals cudaSupport ( with cudaPackages; [ - cuda_cccl + cccl cuda_cudart libcublas ] diff --git a/pkgs/by-name/su/suitesparse/package.nix b/pkgs/by-name/su/suitesparse/package.nix index 761fec746167..3530a231aac1 100644 --- a/pkgs/by-name/su/suitesparse/package.nix +++ b/pkgs/by-name/su/suitesparse/package.nix @@ -60,7 +60,7 @@ effectiveStdenv.mkDerivation rec { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.libcublas ]; diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index 0d0caffe578e..c3de3ca9d5e4 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -18,7 +18,7 @@ let cuda-common-redist = with cudaPackages; [ (lib.getDev cuda_cudart) # cuda_runtime.h (lib.getLib cuda_cudart) - (lib.getDev cuda_cccl) # + (lib.getDev cccl) # (lib.getInclude cuda_nvrtc) # nvrtc.h (lib.getLib cuda_nvrtc) (lib.getInclude libcublas) # cublas_v2.h diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix index ae59eabb2cf3..ed2b439bce0b 100644 --- a/pkgs/by-name/uc/ucc/package.nix +++ b/pkgs/by-name/uc/ucc/package.nix @@ -20,7 +20,7 @@ let inherit (lib.strings) concatStringsSep; inherit (cudaPackages) - cuda_cccl + cccl cuda_cudart cuda_nvcc cuda_nvml_dev @@ -77,7 +77,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ucx ] ++ optionals enableCuda [ - cuda_cccl + cccl cuda_cudart cuda_nvml_dev nccl diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index cbe9c366bd63..e5f39ebf045b 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -58,7 +58,7 @@ let ; cudaBuildInputs = with cudaPackages; [ - cuda_cccl # + cccl # # A temporary hack for reducing the closure size, remove once cudaPackages # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 73c0f6ed83a1..ee04e21e3ed9 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -9,4 +9,11 @@ in final: _: builtins.mapAttrs mkRenamed { # A comment to prevent empty { } from collapsing into a single line + + # NVIDIA renamed cuda_cccl to cccl in CUDA 13.3. + # For the sake of simplicity, we updated the attrname tree-wide, accross all cudaPackages version. + cuda_cccl = { + path = "cccl"; + package = final.cccl; + }; } diff --git a/pkgs/development/cuda-modules/packages/cuda_cccl.nix b/pkgs/development/cuda-modules/packages/cccl.nix similarity index 97% rename from pkgs/development/cuda-modules/packages/cuda_cccl.nix rename to pkgs/development/cuda-modules/packages/cccl.nix index a10f165f2543..64a5636a64d0 100644 --- a/pkgs/development/cuda-modules/packages/cuda_cccl.nix +++ b/pkgs/development/cuda-modules/packages/cccl.nix @@ -7,7 +7,7 @@ }: buildRedist { redistName = "cuda"; - pname = "cuda_cccl"; + pname = if cudaAtLeast "13.3" then "cccl" else "cuda_cccl"; # Restrict header-only packages to a single output. # Also, when using multiple outputs (i.e., `out`, `dev`, and `include`), something isn't being patched correctly, diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix index 2261509e1317..c4a02b2c4317 100644 --- a/pkgs/development/cuda-modules/packages/cuda-samples.nix +++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix @@ -3,7 +3,7 @@ backendStdenv, _cuda, cmake, - cuda_cccl, + cccl, cuda_culibos, cuda_cudart, cuda_nvcc, @@ -71,10 +71,10 @@ backendStdenv.mkDerivation (finalAttrs: { "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \ --replace-fail \ "\''${CUDAToolkit_BIN_DIR}/../include/nv" \ - "${lib.getOutput "include" cuda_cccl}/include/nv" \ + "${lib.getOutput "include" cccl}/include/nv" \ --replace-fail \ "\''${CUDAToolkit_BIN_DIR}/../include/cuda" \ - "${lib.getOutput "include" cuda_cccl}/include/cuda" + "${lib.getOutput "include" cccl}/include/cuda" '' + lib.optionalString (samplesAtLeast "13") '' nixLog "patching sample 0_Introduction/matrixMul_nvrtc" @@ -85,10 +85,10 @@ backendStdenv.mkDerivation (finalAttrs: { "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \ --replace-fail \ "\''${CUDA_INCLUDE_DIR}/cccl/nv" \ - "${lib.getOutput "include" cuda_cccl}/include/nv" \ + "${lib.getOutput "include" cccl}/include/nv" \ --replace-fail \ "\''${CUDA_INCLUDE_DIR}/cccl/cuda" \ - "${lib.getOutput "include" cuda_cccl}/include/cuda" + "${lib.getOutput "include" cccl}/include/cuda" '' # These three samples give undefined references, like # nvlink error : Undefined reference to '__cudaCDP2Free' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o' @@ -184,7 +184,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cuda_cccl + cccl cuda_cudart cuda_nvrtc cuda_nvtx diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix index 364140719d36..1b6a488c968c 100644 --- a/pkgs/development/cuda-modules/packages/cuda_cudart.nix +++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix @@ -4,7 +4,7 @@ _cuda, addDriverRunpath, buildRedist, - cuda_cccl, + cccl, cuda_compat, cuda_crt, cuda_nvcc, @@ -47,7 +47,7 @@ buildRedist (finalAttrs: { # Add the dependency on CCCL's include directory. # - nv/target # TODO(@connorbaker): Check that the dependency offset for this is correct. - ++ [ (lib.getOutput "include" cuda_cccl) ] + ++ [ (lib.getOutput "include" cccl) ] # NOTE: cuda_compat may be null or unavailable ++ lib.optionals (cuda_compat.meta.available or false) [ cuda_compat ]; diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix index 2bb34f2cf84f..a29f76a9500d 100644 --- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix +++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix @@ -5,7 +5,7 @@ setupCudaHook, cudaAtLeast, cudaOlder, - cuda_cccl, + cccl, glibc, lib, libnvvm, @@ -120,7 +120,7 @@ buildRedist (finalAttrs: { substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \ --replace-fail \ '$(TOP)/$(_TARGET_DIR_)/include/cccl' \ - "${lib.getOutput "include" cuda_cccl}/include" + "${lib.getOutput "include" cccl}/include" '' # Unconditional patching to switch to the correct include paths. # NOTE: _TARGET_DIR_ appears to be used for the target architecture, which is relevant for cross-compilation. diff --git a/pkgs/development/cuda-modules/packages/cudatoolkit.nix b/pkgs/development/cuda-modules/packages/cudatoolkit.nix index 6eadaf032c6a..488247d7da3b 100644 --- a/pkgs/development/cuda-modules/packages/cudatoolkit.nix +++ b/pkgs/development/cuda-modules/packages/cudatoolkit.nix @@ -4,7 +4,7 @@ backendStdenv, cudaAtLeast, cudaMajorMinorVersion, - cuda_cccl ? null, + cccl ? null, cuda_crt ? null, cuda_cudart ? null, cuda_cuobjdump ? null, @@ -40,7 +40,7 @@ let cuda_nvprune ]; targetPackages = [ - cuda_cccl + cccl cuda_cudart cuda_cupti cuda_cuxxfilt diff --git a/pkgs/development/cuda-modules/packages/libnvshmem.nix b/pkgs/development/cuda-modules/packages/libnvshmem.nix index b9635e5f6324..88aef3aee66b 100644 --- a/pkgs/development/cuda-modules/packages/libnvshmem.nix +++ b/pkgs/development/cuda-modules/packages/libnvshmem.nix @@ -3,7 +3,7 @@ backendStdenv, buildPackages, cmake, - cuda_cccl, + cccl, cuda_cudart, cuda_nvcc, cuda_nvml_dev, @@ -104,7 +104,7 @@ backendStdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; buildInputs = [ - cuda_cccl + cccl cuda_cudart cuda_nvml_dev cuda_nvrtc diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix index ffe98933173c..2be5633ee327 100644 --- a/pkgs/development/cuda-modules/packages/nccl-tests.nix +++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix @@ -4,7 +4,7 @@ { backendStdenv, _cuda, - cuda_cccl, + cccl, cuda_cudart, cuda_nvcc, cudaNamePrefix, @@ -53,7 +53,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cuda_cccl # + cccl # cuda_cudart nccl ] diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix index f73b91417fe4..7a3979c05dc0 100644 --- a/pkgs/development/cuda-modules/packages/nccl.nix +++ b/pkgs/development/cuda-modules/packages/nccl.nix @@ -1,7 +1,7 @@ { _cuda, backendStdenv, - cuda_cccl, + cccl, cuda_cudart, cuda_nvcc, cudaAtLeast, @@ -82,7 +82,7 @@ backendStdenv.mkDerivation (finalAttrs: { buildInputs = [ (getInclude cuda_nvcc) - cuda_cccl + cccl cuda_cudart ]; diff --git a/pkgs/development/cuda-modules/packages/saxpy/package.nix b/pkgs/development/cuda-modules/packages/saxpy/package.nix index 076afb708895..8c661f5ae0ef 100644 --- a/pkgs/development/cuda-modules/packages/saxpy/package.nix +++ b/pkgs/development/cuda-modules/packages/saxpy/package.nix @@ -1,7 +1,7 @@ { backendStdenv, cmake, - cuda_cccl, + cccl, cuda_cudart, cuda_nvcc, cudaNamePrefix, @@ -26,7 +26,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cuda_cccl + cccl cuda_cudart libcublas ]; diff --git a/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix index 467fc753d882..f4085c255ce7 100644 --- a/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix +++ b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix @@ -4,7 +4,7 @@ autoPatchelfHook, backendStdenv, cmake, - cuda_cccl, + cccl, cuda_cudart, cuda_nvcc, cudatoolkit, @@ -99,7 +99,7 @@ in (lib.getDev libcusparse) cuda_nvcc (lib.getDev cuda_cudart) # - cuda_cccl # + cccl # ]; postPatch = prevAttrs.postPatch or "" + '' diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 8898754b7a72..b229ff708e7d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -434,7 +434,7 @@ effectiveStdenv.mkDerivation { ] ++ optionals enableCuda [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl # + cudaPackages.cccl # cudaPackages.libnpp # npp.h nvidia-optical-flow-sdk ] diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 1f63860b7934..3803a930476d 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -41,7 +41,7 @@ let # NOTE: torchvision doesn't use cudnn; torch does! # For this reason it is not included. cuda-common-redist = with cudaPackages; [ - (lib.getDev cuda_cccl) # + (lib.getDev cccl) # (lib.getDev libcublas) # cublas_v2.h (lib.getLib libcublas) (lib.getInclude libcublas) # cublasLt.h diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix index 4c447c06055a..90d58ac60dee 100644 --- a/pkgs/development/python-modules/causal-conv1d/default.nix +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { with cudaPackages; [ cuda_cudart # cuda_runtime.h, -lcudart - cuda_cccl + cccl libcusparse # cusparse.h libcusolver # cusolverDn.h cuda_nvcc diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index a1ebd8f5a3f9..3db369191fe9 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -32,7 +32,7 @@ let outpaths = lib.filter (outpath: outpath != null) ( with cudaPackages; [ - cuda_cccl # + cccl # cuda_cudart cuda_nvcc # cuda_nvprof diff --git a/pkgs/development/python-modules/deep-ep/default.nix b/pkgs/development/python-modules/deep-ep/default.nix index e44a19e92407..9bb9bacc4f94 100644 --- a/pkgs/development/python-modules/deep-ep/default.nix +++ b/pkgs/development/python-modules/deep-ep/default.nix @@ -79,7 +79,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # + cccl # cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h libcusolver # cusolverDn.h diff --git a/pkgs/development/python-modules/deep-gemm/default.nix b/pkgs/development/python-modules/deep-gemm/default.nix index 4946efaf98ef..2558634a4aab 100644 --- a/pkgs/development/python-modules/deep-gemm/default.nix +++ b/pkgs/development/python-modules/deep-gemm/default.nix @@ -60,7 +60,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { paths = with cudaPackages; [ (lib.getBin cuda_nvcc) # bin/nvcc, bin/ptxas, nvvm/, nvcc.profile (lib.getBin cutlass) # include/cute, include/cutlass - (lib.getInclude cuda_cccl) # include/cuda/std/* (libcu++) + (lib.getInclude cccl) # include/cuda/std/* (libcu++) (lib.getInclude cuda_cudart) # include/cuda_runtime.h, cuda_bf16.h, cuda_fp8.h (lib.getInclude cuda_cuobjdump) # bin/cuobjdump ]; diff --git a/pkgs/development/python-modules/flash-attn/default.nix b/pkgs/development/python-modules/flash-attn/default.nix index fec6c8b73c34..810c79a934fa 100644 --- a/pkgs/development/python-modules/flash-attn/default.nix +++ b/pkgs/development/python-modules/flash-attn/default.nix @@ -68,7 +68,7 @@ let ]; buildInputs = [ - cudaPackages.cuda_cccl # + cudaPackages.cccl # cudaPackages.libcublas # cublas_v2.h cudaPackages.libcurand # curand.h cudaPackages.libcusolver # cusolverDn.h diff --git a/pkgs/development/python-modules/flashinfer/default.nix b/pkgs/development/python-modules/flashinfer/default.nix index b66cce0288ff..c5a98af591e3 100644 --- a/pkgs/development/python-modules/flashinfer/default.nix +++ b/pkgs/development/python-modules/flashinfer/default.nix @@ -56,7 +56,7 @@ buildPythonPackage (finalAttrs: { dontUseCmakeConfigure = true; buildInputs = with cudaPackages; [ - cuda_cccl + cccl cuda_cudart libcublas libcurand diff --git a/pkgs/development/python-modules/gpu-rir/default.nix b/pkgs/development/python-modules/gpu-rir/default.nix index a1d0fda616d2..5f86a484ca41 100644 --- a/pkgs/development/python-modules/gpu-rir/default.nix +++ b/pkgs/development/python-modules/gpu-rir/default.nix @@ -54,7 +54,7 @@ buildPythonPackage { ]; buildInputs = with cudaPackages; [ - cuda_cccl # + cccl # cuda_cudart # cuda_runtime.h libcufft libcurand diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 9ba7319bb5d7..27631cde8599 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -116,7 +116,7 @@ let (lib.getOutput "static" cuda_cudart) # libcudart_static.a # Headers - (lib.getDev cuda_cccl) # block_load.cuh + (lib.getDev cccl) # block_load.cuh (lib.getDev cuda_cudart) # cuda.h (lib.getDev cuda_cupti) # cupti.h (lib.getDev cuda_nvcc) # See https://github.com/google/jax/issues/19811 diff --git a/pkgs/development/python-modules/libmobility/default.nix b/pkgs/development/python-modules/libmobility/default.nix index bb4b74e1ffe7..55be45cb8425 100644 --- a/pkgs/development/python-modules/libmobility/default.nix +++ b/pkgs/development/python-modules/libmobility/default.nix @@ -115,7 +115,7 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs lapack ] ++ (with cudaPackages; [ - cuda_cccl # + cccl # cuda_cudart # CUDA::cuda_driver (driver stub) libcublas libcufft diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 8f52191ff681..90a35ec2a94a 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -89,7 +89,7 @@ buildPythonPackage.override { stdenv = stdenvTarget; } rec { with cudaPackages; [ cuda_cudart # cuda_runtime.h - cuda_cccl # + cccl # libcublas # cublas_v2.h ] ); diff --git a/pkgs/development/python-modules/mamba-ssm/default.nix b/pkgs/development/python-modules/mamba-ssm/default.nix index 3d6b7cfa0512..1e5186787c02 100644 --- a/pkgs/development/python-modules/mamba-ssm/default.nix +++ b/pkgs/development/python-modules/mamba-ssm/default.nix @@ -10,7 +10,6 @@ transformers, triton, cudaPackages, - rocmPackages, config, cudaSupport ? config.cudaSupport, which, @@ -41,7 +40,7 @@ buildPythonPackage rec { with cudaPackages; [ cuda_cudart # cuda_runtime.h, -lcudart - cuda_cccl + cccl libcusparse # cusparse.h libcusolver # cusolverDn.h cuda_nvcc diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index 2f1984589ca5..ab4086935285 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -72,8 +72,8 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ + cccl # cuda_cudart # cuda_runtime.h - cuda_cccl # libcublas # cublas_v2.h libcusolver # cusolverDn.h libcusparse # cusparse.h diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index dabffc010f29..cdc0883ab92b 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -136,7 +136,7 @@ let cudaComponents = with cudaPackages; [ (cuda_nvcc.__spliced.buildHost or cuda_nvcc) (cuda_nvprune.__spliced.buildHost or cuda_nvprune) - cuda_cccl # block_load.cuh + cccl # block_load.cuh cuda_cudart # cuda.h cuda_cupti # cupti.h cuda_nvcc # See https://github.com/google/jax/issues/19811 diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index c83efca823d4..f807e1a696e4 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -550,7 +550,7 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # + cccl # cuda_cudart # cuda_runtime.h and libraries cuda_cupti # For kineto cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 06946cc2ef2a..3b5ff27ad559 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -305,7 +305,7 @@ let mergedCudaLibraries = with cudaPackages; [ cuda_cudart # cuda_runtime.h, -lcudart - cuda_cccl + cccl libcurand # curand_kernel.h libcusparse # cusparse.h libcusolver # cusolverDn.h diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix index 9271b6eb8001..f64ad1f22d0f 100644 --- a/pkgs/development/python-modules/warp-lang/default.nix +++ b/pkgs/development/python-modules/warp-lang/default.nix @@ -166,7 +166,7 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: { ] ++ lib.optionals cudaSupport [ (lib.getStatic cudaPackages.cuda_nvcc) # dependency on nvptxcompiler_static; no dynamic version available - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvcc cudaPackages.cuda_nvrtc diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 323159a80690..14d73d597c11 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -82,7 +82,7 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: { [ cuda_cudart # cuda_runtime_api.h libcusparse # cusparse.h - cuda_cccl # nv/target + cccl # nv/target libcublas # cublas_v2.h libcusolver # cusolverDn.h libcurand # curand_kernel.h