summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/libgpuarray
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2022-04-03 11:19:04 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2022-04-09 08:50:22 +0200
commit1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55 (patch)
tree82668e186706e393a7f43c029be21ea4abfc44e9 /pkgs/development/python-modules/libgpuarray
parent934190fa06dc0de1fe7eecc543583d91657fb5fa (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/development/python-modules/libgpuarray')
-rw-r--r--pkgs/development/python-modules/libgpuarray/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 2be115ae3658..89a83df42684 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -9,7 +9,7 @@
, six
, nose
, Mako
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudaPackages
, openclSupport ? true, ocl-icd, clblas
}:
@@ -30,7 +30,7 @@ buildPythonPackage rec {
configurePhase = "cmakeConfigurePhase";
libraryPath = lib.makeLibraryPath (
- lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ]
+ lib.optionals cudaSupport (with cudaPackages; [ cudatoolkit.lib cudatoolkit.out ])
++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
);