From 397c4b7748df276e6b1b891998785b71999f5e95 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Wed, 30 May 2018 16:37:14 +0200 Subject: [PATCH] cudatoolkit: add 9.0 This version is a dependency of tensorflow binaries --- pkgs/development/compilers/cudatoolkit/default.nix | 7 +++++++ .../development/libraries/science/math/cudnn/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 41e5a60596a..b7c310cf01d 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -192,6 +192,13 @@ in { gcc = gcc5; }; + cudatoolkit_9_0 = common { + version = "9.0.176.1"; + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; + sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + gcc = gcc6; + }; + cudatoolkit_9 = common { version = "9.1.85.1"; url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d612de60661..1a98ecc8743 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -36,6 +36,13 @@ in sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; }; + cudnn_cudatoolkit_9_0 = generic rec { + version = "7.0.5"; + cudatoolkit = cudatoolkit_9_0; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; + sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs"; + }; + cudnn_cudatoolkit_9 = generic rec { version = "7.0.5"; cudatoolkit = cudatoolkit_9; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 617372ded93..502ab80e990 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1869,6 +1869,7 @@ with pkgs; cudatoolkit_7 cudatoolkit_7_5 cudatoolkit_8 + cudatoolkit_9_0 cudatoolkit_9; cudatoolkit = cudatoolkit_9; @@ -1878,7 +1879,8 @@ with pkgs; cudnn_cudatoolkit_7_5 cudnn6_cudatoolkit_8 cudnn_cudatoolkit_8 - cudnn_cudatoolkit_9; + cudnn_cudatoolkit_9 + cudnn_cudatoolkit_9_0; cudnn = cudnn_cudatoolkit_9;