Unverified Commit 44b91b02 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

mistral-rs: fix cuda support (#343254)

parents f7204a5f 25c1a6ee

pkgs/by-name/mi/mistral-rs/package.nix

+23 −8
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
  # nativeBuildInputs

  pkg-config,

  python3,

  autoPatchelfHook,

  autoAddDriverRunpath,



  # buildInputs

  oniguruma,
@@ -86,10 +88,19 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  useFetchCargoVendor = true;

  cargoHash = "sha256-YGGtS8gJJQKIgXxMWjO05ikSVdfVNs+cORbJ+Wf88y4=";



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      pkg-config

      python3

  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];

    ]

    ++ lib.optionals cudaSupport [

      # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook

      # Otherwise, autoPatchelfHook removes driverLink from RUNPATH

      autoPatchelfHook

      autoAddDriverRunpath



      cudaPackages.cuda_nvcc

    ];



  buildInputs =

    [
@@ -97,6 +108,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
      openssl

    ]

    ++ lib.optionals cudaSupport [

      cudaPackages.cuda_cccl

      cudaPackages.cuda_cudart

      cudaPackages.cuda_nvrtc

      cudaPackages.libcublas
@@ -132,13 +144,16 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    // (lib.optionalAttrs cudaSupport {

      CUDA_COMPUTE_CAP = cudaCapability';



      # Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation.

      # We already list CUDA dependencies in buildInputs

      # We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream

      CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart;

    });



  NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [

    "-I${lib.getDev cudaPackages.cuda_cudart}/include"

    "-I${lib.getDev cudaPackages.cuda_cccl}/include"

  appendRunpaths = [

    (lib.makeLibraryPath [

      cudaPackages.libcublas

      cudaPackages.libcurand

    ])

  ];



  # swagger-ui will once more be copied in the target directory during the check phase

pkgs/top-level/release-cuda.nix

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ let 
      lightgbm = linux;

      llama-cpp = linux;

      meshlab = linux;

      mistral-rs = linux;

      monado = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581

      noisetorch = linux;

      obs-studio-plugins.obs-backgroundremoval = linux;