Unverified Commit 2c7f3c0f authored by Connor Baker's avatar Connor Baker Committed by GitHub
Browse files

Merge pull request #272084 from ConnorBaker/fix/ctranslate2-optional-cudnn-dep 

ctranslate2: enable cuDNN only if it is available
parents 5f5e76c0 d23df73a

pkgs/development/libraries/ctranslate2/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec { 
    cudaPackages.cuda_cudart

    cudaPackages.libcublas

    cudaPackages.libcurand

  ] ++ lib.optionals withCuDNN [

  ] ++ lib.optionals (withCUDA && withCuDNN) [

    cudaPackages.cudnn

  ] ++ lib.optionals withOneDNN [

    oneDNN
@@ -87,5 +87,8 @@ stdenv.mkDerivation rec { 
    changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md";

    license = licenses.mit;

    maintainers = with maintainers; [ hexa misuzu ];

    broken =

      (lib.versionOlder cudaPackages.cudaVersion "11.4")

      || !(withCuDNN -> withCUDA);

  };

}

pkgs/top-level/all-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -20935,7 +20935,8 @@ with pkgs; 
  ctranslate2 = callPackage ../development/libraries/ctranslate2 rec {

    stdenv = if withCUDA then gcc11Stdenv else pkgs.stdenv;

    withCUDA = pkgs.config.cudaSupport;

    withCuDNN = pkgs.config.cudaSupport;

    withCuDNN = withCUDA && (cudaPackages ? cudnn);

    cudaPackages = pkgs.cudaPackages;

  };















  ubus = callPackage ../development/libraries/ubus { };