diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-31 19:26:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-31 19:26:41 +0100 |
commit | 8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999 (patch) | |
tree | 339706e62cc1f855220314ff219e5532a8e76b5c /pkgs/top-level | |
parent | ac159e3b4848850a2276d1817fe7c83a417ff2ce (diff) | |
parent | 43f6d9ada488ea66d588756c182ff3a212cf42e0 (diff) | |
download | nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.tar nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.tar.gz nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.tar.bz2 nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.tar.lz nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.tar.xz nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.tar.zst nixlib-8db4814e8e4cb8e7a4187ef82a6b47ec5f51c999.zip |
Merge pull request #49476 from Synthetica9/cuda-update
cudatoolkit, cudnn: many updates
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
2 files changed, 11 insertions, 15 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ceb1b7dc636..dba68f348d24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2062,8 +2062,12 @@ with pkgs; cudatoolkit_7 cudatoolkit_7_5 cudatoolkit_8 + cudatoolkit_9 cudatoolkit_9_0 - cudatoolkit_9; + cudatoolkit_9_1 + cudatoolkit_9_2 + cudatoolkit_10 + cudatoolkit_10_0; cudatoolkit = cudatoolkit_9; @@ -2073,7 +2077,11 @@ with pkgs; cudnn6_cudatoolkit_8 cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 - cudnn_cudatoolkit_9_0; + cudnn_cudatoolkit_9_0 + cudnn_cudatoolkit_9_1 + cudnn_cudatoolkit_9_2 + cudnn_cudatoolkit_10 + cudnn_cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_9; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb69c554de89..cea6346d7581 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2288,20 +2288,8 @@ in { grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; - pytorch = let - # Fails with CUDA 9.1 and GCC 6.4: - # https://github.com/pytorch/pytorch/issues/5831 - # https://devtalk.nvidia.com/default/topic/1028112 - # We should be able to remove this when CUDA 9.2 is released. - cudatoolkit_9 = pkgs.cudatoolkit_9.override { - gcc6 = pkgs.gcc5; - }; - in callPackage ../development/python-modules/pytorch { + pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = cudatoolkit_9; - cudnn = pkgs.cudnn_cudatoolkit_9.override { - inherit cudatoolkit_9; - }; }; pytorchWithCuda = self.pytorch.override { |