BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python3Packages.cupy: 8.40 -> 8.5.0

Browse source 
While we are at it, also switch to using CUDA 11, and properly use the
cuda toolkit stubs instead of improperly linking a specific version of
the Nvidia drivers.
This commit is contained in:
John Ericson 2021-03-23 04:25:41 +00:00
parent f17621f688
commit f67ff2c2ff
2 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkgs/development/python-modules/cupy/default.nix
View file

@ -1,33 +1,35 @@
{ lib, buildPythonPackage { lib, buildPythonPackage
, fetchPypi, isPy3k, linuxPackages , fetchPypi, isPy3k, cython
, fastrlock, numpy, six, wheel, pytest, mock, setuptools , fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools
, cudatoolkit, cudnn, cutensor, nccl , cudatoolkit, cudnn, cutensor, nccl
, addOpenGLRunpath
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cupy"; pname = "cupy";
version = "8.4.0"; version = "8.5.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "58d19af6b2e83388d4f0f6ca4226bae4b947920d2ca4951c2eddc8bc78abf66b"; sha256 = "fb3f8d3b3454beb249b9880502a45fe493c5a44efacc4c72914cbe1a5dbdf803";
}; };
checkInputs = [ preConfigure = ''
pytest export CUDA_PATH=${cudatoolkit}
mock '';
nativeBuildInputs = [
addOpenGLRunpath
cython
]; ];
preConfigure = '' LDFLAGS = "-L${cudatoolkit}/lib/stubs";
export CUDA_PATH=${cudatoolkit}
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
cudatoolkit cudatoolkit
cudnn cudnn
cutensor cutensor
linuxPackages.nvidia_x11
nccl nccl
fastrlock fastrlock
numpy numpy
@ -36,8 +38,20 @@ buildPythonPackage rec {
wheel wheel
]; ];
# In python3, test was failed... checkInputs = [
doCheck = !isPy3k; pytestCheckHook
mock
];
# Won't work with the GPU, whose drivers won't be accessible from the build
# sandbox
doCheck = false;
postFixup = ''
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
addOpenGLRunpath "$lib"
done
'';
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/top-level/python-packages.nix
View file

@ -1602,10 +1602,10 @@ in {
cufflinks = callPackage ../development/python-modules/cufflinks { }; cufflinks = callPackage ../development/python-modules/cufflinks { };
cupy = callPackage ../development/python-modules/cupy { cupy = callPackage ../development/python-modules/cupy {
cudatoolkit = pkgs.cudatoolkit_10_0; cudatoolkit = pkgs.cudatoolkit_11;
cudnn = pkgs.cudnn_cudatoolkit_10_0; cudnn = pkgs.cudnn_cudatoolkit_11;
nccl = pkgs.nccl_cudatoolkit_10; nccl = pkgs.nccl_cudatoolkit_11;
cutensor = pkgs.cutensor_cudatoolkit_10; cutensor = pkgs.cutensor_cudatoolkit_11;
}; };
curio = callPackage ../development/python-modules/curio { }; curio = callPackage ../development/python-modules/curio { };