Commit 028f81c3 authored by Someone Serge's avatar Someone Serge
Browse files

python3Packages.cupy: consume cudnn8 as part of the package set 

This makes overrides easier to write
parent 45892b6e

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

+2 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
}:



let

  inherit (cudaPackages) cudnn_8_9 cutensor nccl;

  inherit (cudaPackages) cudnn cutensor nccl;

  outpaths = with cudaPackages; [

      cuda_cccl # <nv/target>

      cuda_cudart
@@ -83,9 +83,7 @@ buildPythonPackage rec { 


  buildInputs = [

    cudatoolkit-joined

    # CuDNN 9 is not supported:

    # https://github.com/cupy/cupy/issues/8215

    cudnn_8_9

    cudnn

    cutensor

    nccl

  ];

pkgs/top-level/python-packages.nix

+8 −2
Original line number Diff line number Diff line
@@ -2692,8 +2692,14 @@ self: super: with self; { 














  cufflinks = callPackage ../development/python-modules/cufflinks { };



























  cupy = callPackage ../development/python-modules/cupy {















    # cupy 12.2.0 possibly incompatible with cutensor 2.0 that comes with cudaPackages_12













  cupy = callPackage ../development/python-modules/cupy { cudaPackages = pkgs.cudaPackages_11; };













    cudaPackages = pkgs.cudaPackages_11.overrideScope (cu-fi: _: {













      # CuDNN 9 is not supported:













      # https://github.com/cupy/cupy/issues/8215













      cudnn = cu-fi.cudnn_8_9;













    });













  };





























  curio = callPackage ../development/python-modules/curio { };