dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
ctranslate2: enable cuDNN only if it is available
This commit is contained in:
Connor Baker 2023-12-04 14:28:00 -05:00 committed by GitHub
commit 2c7f3c0fb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/ctranslate2/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
cudaPackages.cuda_cudart cudaPackages.cuda_cudart
cudaPackages.libcublas cudaPackages.libcublas
cudaPackages.libcurand cudaPackages.libcurand
] ++ lib.optionals withCuDNN [ ] ++ lib.optionals (withCUDA && withCuDNN) [
cudaPackages.cudnn cudaPackages.cudnn
] ++ lib.optionals withOneDNN [ ] ++ lib.optionals withOneDNN [
oneDNN oneDNN
@ -87,5 +87,8 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ hexa misuzu ]; maintainers = with maintainers; [ hexa misuzu ];
broken =
(lib.versionOlder cudaPackages.cudaVersion "11.4")
|| !(withCuDNN -> withCUDA);
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -20935,7 +20935,8 @@ with pkgs;
ctranslate2 = callPackage ../development/libraries/ctranslate2 rec { ctranslate2 = callPackage ../development/libraries/ctranslate2 rec {
stdenv = if withCUDA then gcc11Stdenv else pkgs.stdenv; stdenv = if withCUDA then gcc11Stdenv else pkgs.stdenv;
withCUDA = pkgs.config.cudaSupport; withCUDA = pkgs.config.cudaSupport;
withCuDNN = pkgs.config.cudaSupport; withCuDNN = withCUDA && (cudaPackages ? cudnn);
cudaPackages = pkgs.cudaPackages;
}; };
ubus = callPackage ../development/libraries/ubus { }; ubus = callPackage ../development/libraries/ubus { };