From 131b8b9b8b5272fa3c5efafdff38f281d56d22d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 May 2019 06:20:34 -0700 Subject: [PATCH] python37Packages.cupy: 5.2.0 -> 5.4.0 (#59651) * python37Packages.cupy: 5.2.0 -> 5.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-cupy/versions * pythonPackages.cupy: use default gcc instead of gcc5 * pythonPackages.cupy: build with CUDA10.0 * pythonPackages.cupy: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/cupy/default.nix | 10 +++------- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index d23d5bef0e49..2b38f4a9e36e 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,16 +1,16 @@ { stdenv, buildPythonPackage -, fetchPypi, isPy3k, linuxPackages, gcc5 +, fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock , cudatoolkit, cudnn, nccl }: buildPythonPackage rec { pname = "cupy"; - version = "5.2.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2"; + sha256 = "1qms1kmzr543hz30jmcmx20cf9xbgzl97a9k44xizsk785dwakbn"; }; checkInputs = [ @@ -18,10 +18,6 @@ buildPythonPackage rec { mock ]; - nativeBuildInputs = [ - gcc5 - ]; - propagatedBuildInputs = [ cudatoolkit cudnn diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99be472edfb0..8e7c1a54799b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1285,9 +1285,9 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { - cudatoolkit = pkgs.cudatoolkit_8; - cudnn = pkgs.cudnn6_cudatoolkit_8; - nccl = pkgs.nccl; + cudatoolkit = pkgs.cudatoolkit_10_0; + cudnn = pkgs.cudnn_cudatoolkit_10_0; + nccl = pkgs.nccl_cudatoolkit_10; }; cx_Freeze = callPackage ../development/python-modules/cx_freeze {};