Merge pull request #325834 from zimbatm/unified-cudaSupport

{libtorch-bin,python3Packages.pytorch-metric-learning}: unified cudaSupport logic
This commit is contained in:
Someone 2024-07-10 15:14:26 +00:00 committed by GitHub
commit 1391bde057
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 8 deletions

View File

@ -4,12 +4,13 @@
, lib
, libcxx
, llvmPackages
, config
, addOpenGLRunpath
, patchelf
, fixDarwinDylibNames
, cudaSupport
, cudaSupport ? config.cudaSupport
}:
let

View File

@ -4,6 +4,7 @@
buildPythonPackage,
fetchFromGitHub,
isPy27,
config,
# build-system
setuptools,
@ -19,7 +20,7 @@
tensorboard,
# tests
cudaSupport,
cudaSupport ? config.cudaSupport,
pytestCheckHook,
torchvision
}:

View File

@ -4249,9 +4249,7 @@ with pkgs;
libtensorflow = python3.pkgs.tensorflow.libtensorflow;
libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix {
inherit (config) cudaSupport;
};
libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { };
tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { };

View File

@ -12814,9 +12814,7 @@ self: super: with self; {
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning {
inherit (pkgs.config) cudaSupport;
};
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { };