diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2022-04-03 11:19:04 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2022-04-09 08:50:22 +0200 |
commit | 1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55 (patch) | |
tree | 82668e186706e393a7f43c029be21ea4abfc44e9 /pkgs/games/katago | |
parent | 934190fa06dc0de1fe7eecc543583d91657fb5fa (diff) |
cudaPackages: overhaul of how we package cuda packages
There are many different versions of the `cudatoolkit` and related cuda packages, and it can be tricky to ensure they remain compatible. - `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist"); - expressions should now use `cudaPackages` as parameter instead of the individual cuda packages; - `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version; - `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
Diffstat (limited to 'pkgs/games/katago')
-rw-r--r-- | pkgs/games/katago/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 3265f3d63382f..6328b3f9bc820 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -1,8 +1,7 @@ { stdenv , boost , cmake -, cudatoolkit -, cudnn +, cudaPackages , eigen , fetchFromGitHub , gperftools @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!enableGPU) [ eigen ] ++ lib.optionals (enableGPU && enableCuda) [ - cudnn + cudaPackages.cudnn mesa.drivers ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers @@ -86,7 +85,7 @@ stdenv.mkDerivation rec { preConfigure = '' cd cpp/ '' + lib.optionalString enableCuda '' - export CUDA_PATH="${cudatoolkit}" + export CUDA_PATH="${cudaPackages.cudatoolkit}" export EXTRA_LDFLAGS="-L/run/opengl-driver/lib" ''; |