From c6424f784ccd5cc1f75a63bf119060ef7e64c403 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 9 Jul 2024 14:56:39 +0200 Subject: [PATCH] python3Packages.pytorch-metric-learning: move cudaSupport logic to package Use the same pattern as all the majority of packages using cuda --- .../python-modules/pytorch-metric-learning/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e667590bf1b7..049064754937 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, isPy27, + config, # build-system setuptools, @@ -19,7 +20,7 @@ tensorboard, # tests - cudaSupport, + cudaSupport ? config.cudaSupport, pytestCheckHook, torchvision }: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7adddc2da501..366d3dac2814 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12812,9 +12812,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 { };