From da07f98d58bcdd8d7a6657cae3d3eb01d061a5c1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 9 Jul 2024 14:55:19 +0200 Subject: [PATCH] libtorch-bin: move cudaSupport logic to package Follow the same pattern as the majority of packages using cuda --- pkgs/development/libraries/science/math/libtorch/bin.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 5b08cfa7dcf0..8e77ac25dd72 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -4,12 +4,13 @@ , lib , libcxx , llvmPackages +, config , addOpenGLRunpath , patchelf , fixDarwinDylibNames -, cudaSupport +, cudaSupport ? config.cudaSupport }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d48e0156367b..93ca8817c5bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4256,9 +4256,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 { };