pyrox.dev
Merge pull request #301176 from SomeoneSerge/drop-cudapackages-autoAddDriverRunpath
cudaPackages.autoAddDriverRunpath: drop the redundant copy of the hook
authored by Connor Baker and committed by GitHub f01fc7f1 26cbde41
-8
pkgs/development/cuda-modules/setup-hooks/auto-add-driver-runpath-hook.sh
-8
pkgs/development/cuda-modules/setup-hooks/auto-add-driver-runpath-hook.sh
···
1
-
# shellcheck shell=bash
2
-
# Run addDriverRunpath on all dynamically linked ELF files
3
-
echo "Sourcing auto-add-driver-runpath-hook"
4
-
5
-
if [ -z "${dontUseAutoAddDriverRunpath-}" ]; then
6
-
echo "Using autoAddDriverRunpath"
7
-
postFixupHooks+=("autoFixElfFiles addDriverRunpath")
8
-
fi
-64
pkgs/development/cuda-modules/setup-hooks/auto-fix-elf-files.sh
-64
pkgs/development/cuda-modules/setup-hooks/auto-fix-elf-files.sh
···
1
-
# shellcheck shell=bash
2
-
# List all dynamically linked ELF files in the outputs and apply a generic fix
3
-
# action provided as a parameter (currently used to add the CUDA or the
4
-
# cuda_compat driver to the runpath of binaries)
5
-
echo "Sourcing cuda/fix-elf-files.sh"
6
-
7
-
# Returns the exit code of patchelf --print-rpath.
8
-
# A return code of 0 (success) means the ELF file has a dynamic section, while
9
-
# a non-zero return code means the ELF file is statically linked (or is not an
10
-
# ELF file).
11
-
elfHasDynamicSection() {
12
-
local libPath
13
-
14
-
if [[ $# -eq 0 ]]; then
15
-
echo "elfHasDynamicSection: no library path provided" >&2
16
-
exit 1
17
-
elif [[ $# -gt 1 ]]; then
18
-
echo "elfHasDynamicSection: too many arguments" >&2
19
-
exit 1
20
-
elif [[ "$1" == "" ]]; then
21
-
echo "elfHasDynamicSection: empty library path" >&2
22
-
exit 1
23
-
else
24
-
libPath="$1"
25
-
shift 1
26
-
fi
27
-
28
-
patchelf --print-rpath "$libPath" >& /dev/null
29
-
return $?
30
-
}
31
-
32
-
# Run a fix action on all dynamically linked ELF files in the outputs.
33
-
autoFixElfFiles() {
34
-
local fixAction
35
-
local outputPaths
36
-
37
-
if [[ $# -eq 0 ]]; then
38
-
echo "autoFixElfFiles: no fix action provided" >&2
39
-
exit 1
40
-
elif [[ $# -gt 1 ]]; then
41
-
echo "autoFixElfFiles: too many arguments" >&2
42
-
exit 1
43
-
elif [[ "$1" == "" ]]; then
44
-
echo "autoFixElfFiles: empty fix action" >&2
45
-
exit 1
46
-
else
47
-
fixAction="$1"
48
-
fi
49
-
50
-
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
51
-
52
-
find "${outputPaths[@]}" -type f -print0 | while IFS= read -rd "" f; do
53
-
if ! isELF "$f"; then
54
-
continue
55
-
elif elfHasDynamicSection "$f"; then
56
-
# patchelf returns an error on statically linked ELF files, and in
57
-
# practice fixing actions all involve patchelf
58
-
echo "autoFixElfFiles: using $fixAction to fix $f" >&2
59
-
$fixAction "$f"
60
-
elif (( "${NIX_DEBUG:-0}" >= 1 )); then
61
-
echo "autoFixElfFiles: skipping a statically-linked ELF file $f"
62
-
fi
63
-
done
64
-
}
+6
-24
pkgs/development/cuda-modules/setup-hooks/extension.nix
+6
-24
pkgs/development/cuda-modules/setup-hooks/extension.nix
···
1
1
final: _: {
2
-
# Helper hook used in both autoAddCudaCompatRunpath and
3
-
# autoAddDriverRunpath that applies a generic patching action to all elf
4
-
# files with a dynamic linking section.
5
-
autoFixElfFiles = final.callPackage (
6
-
{ makeSetupHook }: makeSetupHook { name = "auto-fix-elf-files"; } ./auto-fix-elf-files.sh
7
-
) { };
2
+
# TODO:
3
+
# - Move to cuda-modules/aliases.nix once
4
+
# https://github.com/NixOS/nixpkgs/issues/141803 is ready.
5
+
# - Consider removing after 24.11.
6
+
inherit (final.pkgs) autoAddDriverRunpath autoFixElfFiles;
7
+
autoAddOpenGLRunpathHook = final.autoAddDriverRunpath;
8
8
9
9
# Internal hook, used by cudatoolkit and cuda redist packages
10
10
# to accommodate automatic CUDAToolkit_ROOT construction
···
31
31
} ./setup-cuda-hook.sh
32
32
) { }
33
33
);
34
-
35
-
autoAddDriverRunpath = final.callPackage (
36
-
{
37
-
addDriverRunpath,
38
-
autoFixElfFiles,
39
-
makeSetupHook,
40
-
}:
41
-
makeSetupHook {
42
-
name = "auto-add-opengl-runpath-hook";
43
-
propagatedBuildInputs = [
44
-
addDriverRunpath
45
-
autoFixElfFiles
46
-
];
47
-
} ./auto-add-driver-runpath-hook.sh
48
-
) { };
49
-
50
-
# Deprecated: an alias kept for compatibility. Consider removing after 24.11
51
-
autoAddOpenGLRunpathHook = final.autoAddDriverRunpath;
52
34
53
35
# autoAddCudaCompatRunpath hook must be added AFTER `setupCudaHook`. Both
54
36
# hooks prepend a path with `libcuda.so` to the `DT_RUNPATH` section of