Unverified Commit 446fee38 authored by Someone's avatar Someone Committed by GitHub
Browse files

Merge pull request #301188 from SomeoneSerge/cudaPackages/rename-cudatoolkit 

cudaPackages.cudatoolkit: replace with symlinkJoin
parents 91ff44d5 2c51064b

nixos/doc/manual/release-notes/rl-2405.section.md

+6 −0
Original line number Diff line number Diff line
@@ -315,6 +315,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- The `cudaPackages` package scope has been updated to `cudaPackages_12`.



- The deprecated `cudaPackages.cudatoolkit` has been replaced with a

  symlink-based wrapper for the splayed redistributable CUDA packages. The

  wrapper only includes tools and libraries necessary to build common packages

  like e.g. tensorflow. The original runfile-based `cudatoolkit` is still

  available as `cudatoolkit-legacy-runfile`.



- The `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details.



- Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version.

pkgs/applications/science/math/caffe/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
}:



let

  inherit (cudaPackages) cudatoolkit nccl;

  inherit (cudaPackages) backendStdenv cudatoolkit nccl;

  # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1.

  # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead.

  # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default.
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec { 
      "-DBLAS=open"

    ] ++ (if cudaSupport then [

           "-DCUDA_ARCH_NAME=All"

           "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"

           "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc"

         ] else [ "-DCPU_ONLY=ON" ])

      ++ ["-DUSE_NCCL=${toggle ncclSupport}"]

      ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]

pkgs/applications/science/math/mxnet/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
}:



let

  inherit (cudaPackages) cudatoolkit cudaFlags cudnn;

  inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn;

in



assert cudnnSupport -> cudaSupport;
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec { 
    ++ (if cudaSupport then [

      "-DUSE_OLDCMAKECUDA=ON"  # see https://github.com/apache/incubator-mxnet/issues/10743

      "-DCUDA_ARCH_NAME=All"

      "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"

      "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc"

      "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.realArches}"

    ] else [ "-DUSE_CUDA=OFF" ])

    ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";

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

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ backendStdenv.mkDerivation rec { 
  };



  meta = with lib; {

    description = "A compiler for NVIDIA GPUs, math libraries, and tools";

    description = "The deprecated runfile-based CUDAToolkit installation (a compiler for NVIDIA GPUs, math libraries, and tools)";

    homepage = "https://developer.nvidia.com/cuda-toolkit";

    platforms = [ "x86_64-linux" ];

    license = licenses.nvidiaCuda;

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

0 → 100644
+86 −0
Original line number Diff line number Diff line 
{

  lib,

  symlinkJoin,

  backendStdenv,

  cudaOlder,

  cudatoolkit-legacy-runfile,

  cudaVersion,

  cuda_cccl ? null,

  cuda_cudart ? null,

  cuda_cuobjdump ? null,

  cuda_cupti ? null,

  cuda_cuxxfilt ? null,

  cuda_gdb ? null,

  cuda_nvcc ? null,

  cuda_nvdisasm ? null,

  cuda_nvml_dev ? null,

  cuda_nvprune ? null,

  cuda_nvrtc ? null,

  cuda_nvtx ? null,

  cuda_profiler_api ? null,

  cuda_sanitizer_api ? null,

  libcublas ? null,

  libcufft ? null,

  libcurand ? null,

  libcusolver ? null,

  libcusparse ? null,

  libnpp ? null,

}:



let

  getAllOutputs = p: [

    (lib.getBin p)

    (lib.getLib p)

    (lib.getDev p)

  ];

  hostPackages = [

    cuda_cuobjdump

    cuda_gdb

    cuda_nvcc

    cuda_nvdisasm

    cuda_nvprune

  ];

  targetPackages = [

    cuda_cccl

    cuda_cudart

    cuda_cupti

    cuda_cuxxfilt

    cuda_nvml_dev

    cuda_nvrtc

    cuda_nvtx

    cuda_profiler_api

    cuda_sanitizer_api

    libcublas

    libcufft

    libcurand

    libcusolver

    libcusparse

    libnpp

  ];



  # This assumes we put `cudatoolkit` in `buildInputs` instead of `nativeBuildInputs`:

  allPackages = (map (p: p.__spliced.buildHost or p) hostPackages) ++ targetPackages;

in



if cudaOlder "11.4" then

  cudatoolkit-legacy-runfile

else

  symlinkJoin rec {

    name = "cuda-merged-${cudaVersion}";

    version = cudaVersion;



    paths = builtins.concatMap getAllOutputs allPackages;



    passthru = {

      cc = lib.warn "cudaPackages.cudatoolkit is deprecated, refer to the manual and use splayed packages instead" backendStdenv.cc;

      lib = symlinkJoin {

        inherit name;

        paths = map (p: lib.getLib p) allPackages;

      };

    };



    meta = with lib; {

      description = "A wrapper substituting the deprecated runfile-based CUDA installation";

      license = licenses.nvidiaCuda;

    };

  }