From b1fec2a5747ecf7aebdd2cea812bc13ae963fef7 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 18 Mar 2023 23:08:30 -0400 Subject: [PATCH] python3Packages.torchvision: switch to backendStdenv.cc from cudatoolkit.cc --- pkgs/development/python-modules/torchvision/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 9539b1bb0bfe..449d635372a0 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -15,7 +15,7 @@ let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion; + inherit (cudaPackages) backendStdenv cudaVersion; # NOTE: torchvision doesn't use cudnn; torch does! # For this reason it is not included. @@ -65,8 +65,8 @@ buildPythonPackage { # NOTE: We essentially override the compilers provided by stdenv because we don't have a hook # for cudaPackages to swap in compilers supported by NVCC. + lib.optionalString cudaSupport '' - export CC=${cudatoolkit.cc}/bin/cc - export CXX=${cudatoolkit.cc}/bin/c++ + export CC=${backendStdenv.cc}/bin/cc + export CXX=${backendStdenv.cc}/bin/c++ export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" export FORCE_CUDA=1 '';