From 7cd68c3dc8260a107a32f532a648e5ec32fbfe75 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:34:25 -0700 Subject: [PATCH] python3Packages.torch*: use pkgs.autoAddDriverRunpath --- pkgs/development/python-modules/torch/bin.nix | 3 ++- pkgs/development/python-modules/torch/default.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index bee32b616345..bc0e36ba553c 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, autoAddDriverRunpath , fetchurl , python , pythonAtLeast @@ -40,7 +41,7 @@ in buildPythonPackage { nativeBuildInputs = lib.optionals stdenv.isLinux [ addOpenGLRunpath autoPatchelfHook - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; buildInputs = lib.optionals stdenv.isLinux (with cudaPackages; [ diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 82ad61a19167..620b8a3581e4 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, config, cudaSupport ? config.cudaSupport, cudaPackages, + autoAddDriverRunpath, effectiveMagma ? if cudaSupport then magma-cuda-static else if rocmSupport then magma-hip