summary refs log tree commit diff
path: root/pkgs/applications/science/math/mxnet/default.nix
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/applications/science/math/mxnet/default.nix
parent934190fa06dc0de1fe7eecc543583d91657fb5fa (diff)
downloadnixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.tar
nixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.tar.gz
nixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.tar.bz2
nixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.tar.lz
nixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.tar.xz
nixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.tar.zst
nixpkgs-1d63f89caaf140ac33f1796dc0aaeb20f4ac4e55.zip
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/applications/science/math/mxnet/default.nix')
-rw-r--r--pkgs/applications/science/math/mxnet/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index 8e5e1ebd7e8..8353226cefe 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,10 +1,14 @@
 { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake
 , opencv3, gtest, blas, gomp, llvmPackages, perl
-, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
-, cudnnSupport ? cudaSupport, cudnn
+, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11
+, cudnnSupport ? cudaSupport
 , cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ]
 }:
 
+let
+  inherit (cudaPackages) cudatoolkit cudnn;
+in
+
 assert cudnnSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {