Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nvidia-ctk and use RUNTIME_DIRECTORY when calling nvidia-ctk #193

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Update nvidia-ctk and use RUNTIME_DIRECTORY when calling nvidia-ctk #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions modules/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,30 +242,28 @@ in
otaUtils # Tools for UEFI capsule updates
];

systemd.tmpfiles.rules = lib.optional nvidiaContainerRuntimeActive "d /var/run/cdi 0755 root root - -";

systemd.services.nvidia-cdi-generate = {
enable = nvidiaContainerRuntimeActive;
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart =
let
exe = "${pkgs.nvidia-jetpack.nvidia-ctk}/bin/nvidia-ctk";
in
toString [
exe
"cdi"
"generate"
"--nvidia-ctk-path=${exe}" # it is odd that this is needed, should be the same as /proc/self/exe?
"--driver-root=${pkgs.nvidia-jetpack.containerDeps}" # the root where nvidia libs will be resolved from
"--dev-root=/" # the root where chardevs will be resolved from
"--mode=csv"
"--csv.file=${pkgs.nvidia-jetpack.l4tCsv}"
"--output=/var/run/cdi/jetpack-nixos" # a yaml file extension is added by the nvidia-ctk tool
];
RuntimeDirectory = "cdi";
};
wantedBy = [ "multi-user.target" ];
script =
let
exe = lib.getExe pkgs.nvidia-jetpack.nvidia-ctk;
in
''
${exe} cdi generate \
--nvidia-ctk-path=${exe} \
--driver-root=${pkgs.nvidia-jetpack.containerDeps} \
--ldconfig-path ${lib.getExe' pkgs.glibc "ldconfig"} \
--dev-root=/ \
--mode=csv \
--csv.file=${pkgs.nvidia-jetpack.l4tCsv} \
--output="$RUNTIME_DIRECTORY/jetpack-nixos"
'';
};

# Used by libEGL_nvidia.so.0
Expand Down
33 changes: 14 additions & 19 deletions pkgs/containers/nvidia-ctk.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,39 @@
{ fetchFromGitLab, buildGoModule, fetchpatch }:
{ buildGoModule, fetchFromGitHub, fetchpatch }:

buildGoModule rec {
pname = "nvidia-ctk";
version = "unstable-${builtins.substring 0 7 src.rev}";
version = "1.15.0-rc.4";

# TODO(jared): pin to v1.15.0 once it is released
# We currently rely on some features in an unreleased version of nvidia
# container toolkit.
src = fetchFromGitLab {
src = fetchFromGitHub {
owner = "nvidia";
repo = "container-toolkit/container-toolkit";
rev = "a2262d00cc6d98ac2e95ae2f439e699a7d64dc17";
hash = "sha256-Oi04PIES0qTih/EiFBStIoBadM3H52+81KEfUumQcIs=";
repo = "nvidia-container-toolkit";
rev = "v${version}";
hash = "sha256-Ky0mGothIq5BOAHc4ujrMrh1niBYUoSgaRnv30ymjsE=";
};

patches = [
# ensure nvidia-ctk can build with Go versions less than 1.20 (currently
# required on their latest release)
(fetchpatch {
name = "Fix-double-error-wrap-fmt";
url = "https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/commit/80756d00a6b75761103c50f605cece5fa7e39392.patch";
hash = "sha256-hoeMUUPWKToCR7V/JG26wF6SCoHQwQORcGimH6EXDJ8=";
})
(fetchpatch {
name = "Use-golang-1.17";
url = "https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/commit/5956b04096d1a92b241b13cc1f3e208f8b99eea0.patch";
hash = "sha256-VB3+ijc2Pdlm1W2LqvCjx9KDYKinWBkr/eiUJEwig/o=";
name = "Add-errors-Join-wrapper";
url = "https://github.com/NVIDIA/nvidia-container-toolkit/commit/92f17e94939bf8c213419749f5f7b48d2f0e618c.patch";
hash = "sha256-ioWstYky7LbIGtlfMMlbhIVN8yH7Qgp3z4wrkytT3TY=";
})
(fetchpatch {
name = "Draft-Compat-with-golang-1.17";
url = "https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/commit/86f68a49014a4cffb7dcb51f14a02f6f1816b2ee.patch";
hash = "sha256-ioWstYky7LbIGtlfMMlbhIVN8yH7Qgp3z4wrkytT3TY=";
name = "Fix-double-error-wrap-fmt";
url = "https://github.com/NVIDIA/nvidia-container-toolkit/commit/f23fd2ce38ee3a9e87ac41c265b637cf97990ac7.patch";
hash = "sha256-hoeMUUPWKToCR7V/JG26wF6SCoHQwQORcGimH6EXDJ8=";
})
# ensure nvidia-ctk can find ldconfig
./nixos-ldconfig.patch
];

subPackages = [ "cmd/nvidia-ctk" ];

vendorHash = null;

ldflags = [ "-s" "-w" "-extldflags=-Wl,-z,lazy" ];

meta.mainProgram = "nvidia-ctk";
}
Loading