From d23df73a07a8cb8a3b8fb0630a8a861a2afc74b6 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 1 Dec 2023 16:45:08 +0000 Subject: [PATCH] ctranslate2: enable cuDNN only if it is available --- pkgs/development/libraries/ctranslate2/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index 83eb9bf3a895..58906b608231 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -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); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e52c56b3a738..5f8d846334d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20931,7 +20931,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 { };