Unverified Commit 7b73c860 authored by Someone's avatar Someone Committed by GitHub
Browse files

Merge pull request #324672 from cfhammill/patch-and-update-cupy 

python312Packages.cupy: 13.0->13.2, patch to find libcudart-static
parents 717249a0 eb065410

pkgs/development/python-modules/cupy/default.nix

+23 −11
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchPypi,

  cython,

  fetchFromGitHub,

  cython_0,

  fastrlock,

  numpy,

  wheel,
@@ -13,13 +13,12 @@ 
  addOpenGLRunpath,

  pythonOlder,

  symlinkJoin,

  fetchpatch

}:



let

  inherit (cudaPackages) cudnn cutensor nccl;

  cudatoolkit-joined = symlinkJoin {

    name = "cudatoolkit-joined-${cudaPackages.cudaVersion}";

    paths = with cudaPackages; [

  outpaths = with cudaPackages; [

      cuda_cccl # <nv/target>

      cuda_cudart

      cuda_nvcc # <crt/host_defines.h>
@@ -36,6 +35,9 @@ let 
      # Missing:

      # cusparselt

  ];

  cudatoolkit-joined = symlinkJoin {

    name = "cudatoolkit-joined-${cudaPackages.cudaVersion}";

    paths = outpaths ++ lib.concatMap (f: lib.map f outpaths) [lib.getLib lib.getDev (lib.getOutput "static") (lib.getOutput "stubs")];

  };

in

buildPythonPackage rec {
@@ -45,11 +47,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 +77,7 @@ buildPythonPackage rec { 
    setuptools

    wheel

    addOpenGLRunpath

    cython

    cython_0

    cudaPackages.cuda_nvcc

  ];
@@ -77,7 +90,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