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

Merge pull request #323056 from SomeoneSerge/fix/cudaPackages/outputSpecified 

cudaPackages: make getOutput work again
parents 88de6620 82018339

pkgs/by-name/gp/gpt4all/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -47,12 +47,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ] ++ lib.optionals cudaSupport (

      with cudaPackages;

      [

        cuda_cccl.dev

        cuda_cudart.dev

        cuda_cudart.lib

        cuda_cudart.static

        libcublas.dev

        libcublas.lib

        cuda_cccl

        cuda_cudart

        libcublas

      ]);



  cmakeFlags = [

pkgs/by-name/ll/llama-cpp/package.nix

+3 −7
Original line number Diff line number Diff line
@@ -46,16 +46,12 @@ let 
    ++ optionals metalSupport [ MetalKit ];



   cudaBuildInputs = with cudaPackages; [

    cuda_cccl.dev # <nv/target>

    cuda_cccl # <nv/target>



    # A temporary hack for reducing the closure size, remove once cudaPackages

    # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792

    cuda_cudart.dev

    cuda_cudart.lib

    cuda_cudart.static

    libcublas.dev

    libcublas.lib

    libcublas.static

    cuda_cudart

    libcublas

  ];



  rocmBuildInputs = with rocmPackages; [

pkgs/by-name/ol/ollama/package.nix

+8 −9
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ let 
  };



  cudaToolkit = buildEnv {

    name = "cuda-toolkit";

    ignoreCollisions = true; # FIXME: find a cleaner way to do this without ignoring collisions

    name = "cuda-merged";

    paths = [

      cudaPackages.cudatoolkit

      cudaPackages.cuda_cudart

      cudaPackages.cuda_cudart.static

      (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc))

      (lib.getLib cudaPackages.cuda_cudart)

      (lib.getOutput "static" cudaPackages.cuda_cudart)

      (lib.getLib cudaPackages.libcublas)

    ];

  };
@@ -142,10 +142,6 @@ in 
goBuild ((lib.optionalAttrs enableRocm {

  ROCM_PATH = rocmPath;

  CLBlast_DIR = "${clblast}/lib/cmake/CLBlast";

}) // (lib.optionalAttrs enableCuda {

  CUDA_LIB_DIR = "${cudaToolkit}/lib";

  CUDACXX = "${cudaToolkit}/bin/nvcc";

  CUDAToolkit_ROOT = cudaToolkit;

}) // {

  inherit pname version src vendorHash;
@@ -153,6 +149,8 @@ goBuild ((lib.optionalAttrs enableRocm { 
    cmake

  ] ++ lib.optionals enableRocm [

    rocmPackages.llvm.bintools

  ] ++ lib.optionals enableCuda [

    cudaPackages.cuda_nvcc

  ] ++ lib.optionals (enableRocm || enableCuda) [

    makeWrapper

    autoAddDriverRunpath
@@ -163,6 +161,7 @@ goBuild ((lib.optionalAttrs enableRocm { 
    (rocmLibs ++ [ libdrm ])

  ++ lib.optionals enableCuda [

    cudaPackages.cuda_cudart

    cudaPackages.libcublas

  ] ++ lib.optionals stdenv.isDarwin

    metalFrameworks;

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

+22 −19
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ filterAndCreateOverrides { 
    }:

    prevAttrs: {

      buildInputs = prevAttrs.buildInputs ++ [

        libcublas.lib

        libcublas

        numactl

        rdma-core

      ];
@@ -66,17 +66,17 @@ filterAndCreateOverrides { 
      buildInputs =

        prevAttrs.buildInputs

        # Always depends on this

        ++ [ libcublas.lib ]

        ++ [ libcublas ]

        # Dependency from 12.0 and on

        ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ]

        ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ]

        # Dependency from 12.1 and on

        ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse.lib ];

        ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse ];



      brokenConditions = prevAttrs.brokenConditions // {

        "libnvjitlink missing (CUDA >= 12.0)" =

          !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null));

          !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null));

        "libcusparse missing (CUDA >= 12.1)" =

          !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse.lib != null));

          !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse != null));

      };

    };
@@ -90,16 +90,16 @@ filterAndCreateOverrides { 
      buildInputs =

        prevAttrs.buildInputs

        # Dependency from 12.0 and on

        ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ];

        ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ];



      brokenConditions = prevAttrs.brokenConditions // {

        "libnvjitlink missing (CUDA >= 12.0)" =

          !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null));

          !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null));

      };

    };



  # TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from

  # cuda_nvcc.dev. It would be nice to be able to encode that.

  # (getDev cuda_nvcc). It would be nice to be able to encode that.

  cuda_cudart =

    { addDriverRunpath, lib }:

    prevAttrs: {
@@ -166,13 +166,17 @@ filterAndCreateOverrides { 
    };



  cuda_nvcc =

    {

      backendStdenv,

      cuda_cudart,

      lib,

      setupCudaHook,

    }:

    { backendStdenv, setupCudaHook }:

    prevAttrs: {

      # Merge "bin" and "dev" into "out" to avoid circular references

      outputs = builtins.filter (

        x:

        !(builtins.elem x [

          "dev"

          "bin"

        ])

      ) prevAttrs.outputs;



      # Patch the nvcc.profile.

      # Syntax:

      # - `=` for assignment,
@@ -230,8 +234,7 @@ filterAndCreateOverrides { 
      };

    };



  cuda_nvprof =

    { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti.lib ]; };

  cuda_nvprof = { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti ]; };



  cuda_demo_suite =

    {
@@ -245,8 +248,8 @@ filterAndCreateOverrides { 
    prevAttrs: {

      buildInputs = prevAttrs.buildInputs ++ [

        freeglut

        libcufft.lib

        libcurand.lib

        libcufft

        libcurand

        libGLU

        libglvnd

        mesa

pkgs/development/cuda-modules/generic-builders/manifest.nix

+10 −32
Original line number Diff line number Diff line
@@ -290,42 +290,23 @@ backendStdenv.mkDerivation (finalAttrs: { 
    "libcuda.so.*"

  ];



  # The out output leverages the same functionality which backs the `symlinkJoin` function in

  # Nixpkgs:

  # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510

  #

  # That should allow us to emulate "fat" default outputs without having to actually create them.

  #

  # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency.

  postPhases = [ "postPatchelf" ];

  # _multioutPropagateDev() currently expects a space-separated string rather than an array

  preFixup = ''

    export propagatedBuildOutputs="''${propagatedBuildOutputs[@]}"

  '';



  # Propagate all outputs, including `static`

  propagatedBuildOutputs = builtins.filter (x: x != "dev") finalAttrs.outputs;



  # For each output, create a symlink to it in the out output.

  # NOTE: We must recreate the out output here, because the setup hook will have deleted it if it was empty.

  # Kept in case overrides assume postPhases have already been defined

  postPhases = [ "postPatchelf" ];

  postPatchelf = ''

    mkdir -p "$out"

    for output in $(getAllOutputNames); do

      if [[ "$output" != "out" ]]; then

        ${meta.getExe lndir} "''${!output}" "$out"

      fi

    done

    true

  '';



  # Make the CUDA-patched stdenv available

  passthru.stdenv = backendStdenv;



  # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs

  # from depending on `out` by default.

  # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196

  # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs.

  propagatedBuildOutputs = false;



  # By default, if the dev output exists it just uses that.

  # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or

  # anything of the sort. To remedy this, we set outputSpecified to true, and use

  # outputsToInstall, which tells Nix which outputs to use when the package name is used

  # unqualified (that is, without an explicit output).

  outputSpecified = true;



  meta = {

    description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}";

    sourceProvenance = [ sourceTypes.binaryNativeCode ];
@@ -343,8 +324,5 @@ backendStdenv.mkDerivation (finalAttrs: { 
      lists.optionals isBadPlatform finalAttrs.meta.platforms;

    license = licenses.unfree;

    maintainers = teams.cuda.members;

    # Force the use of the default, fat output by default (even though `dev` exists, which

    # causes Nix to prefer that output over the others if outputSpecified isn't set).

    outputsToInstall = [ "out" ];

  };

})