Unverified Commit 1ac9eb56 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

python3Packages.cupy: move env vars into env for structuredAttrs

parent c6147e10

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

+8 −7
Original line number Diff line number Diff line
@@ -62,10 +62,14 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } rec { 
    fetchSubmodules = true;

  };



  env.LDFLAGS = toString [

  env = {

    LDFLAGS = toString [

      # Fake libcuda.so (the real one is deployed impurely)

      "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"

    ];

    # NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages

    CUDA_PATH = "${cudatoolkit-joined}";

  };



  # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Setting both

  # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in
@@ -95,9 +99,6 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } rec { 
    nccl

  ];



  # NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages

  CUDA_PATH = "${cudatoolkit-joined}";



  dependencies = [

    fastrlock

    numpy