From 6d785b5787d2ee1f37de66f6d8e31a44ba3e8bc2 Mon Sep 17 00:00:00 2001 From: cfhammill Date: Wed, 3 Jul 2024 14:33:52 -0400 Subject: [PATCH] cupy: 13.0->13.2, patch to find libcudart-static --- .../python-modules/cupy/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 8c042a9a965e..e14f274682ab 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - cython, + fetchFromGitHub, + cython_0, fastrlock, numpy, wheel, @@ -13,6 +13,7 @@ addOpenGLRunpath, pythonOlder, symlinkJoin, + fetchpatch }: let @@ -45,11 +46,22 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-5NvSsu1BWaXMDA+YpxCgFJUOssFu60VelWEo87O9DVE="; + src = fetchFromGitHub { + owner = "cupy"; + repo = "cupy"; + rev = "v13.2.0"; + hash = "sha256-vZAtpIZztmsYeJeuq7yl7kgZse2azrIM3efHDmUswJI="; + fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = + "https://github.com/cfhammill/cupy/commit/67526c756e4a0a70f0420bf0e7f081b8a35a8ee5.patch"; + hash = "sha256-WZgexBdM9J0ep5s+9CGZriVq0ZidCRccox+g0iDDywQ="; + }) + ]; + # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in # a small amount of thrashing but it turns out there are a large number of @@ -64,7 +76,7 @@ buildPythonPackage rec { setuptools wheel addOpenGLRunpath - cython + cython_0 cudaPackages.cuda_nvcc ]; @@ -77,7 +89,6 @@ buildPythonPackage rec { NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages CUDA_PATH = "${cudatoolkit-joined}"; - LDFLAGS = "-L${cudaPackages.cuda_cudart}/lib/stubs"; propagatedBuildInputs = [ fastrlock