Add envvar for libcuda.so parent dir to CDI spec #1030
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change adds environment variables to the Discover interface. Signed-off-by: Evan Lezar <[email protected]>
This change adds a LIBCUDA_SO_PARENT_DIRECTORY_CONTAINER_PATH envvar to a generated CDI specification. This reports where the `libcuda.so.*` libraries will be injected into the container. Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
add-driver-lib-root-envvar
branch
from
7b58a3e to
5349a84
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR introduces a LIBCUDA_SO_PARENT_DIRECTORY_CONTAINER_PATH environment variable to the generated CDI specification and implements the required EnvVars interface across multiple discoverer types.
- Adds an EnvVars() method to several discoverers returning empty environment variable lists where appropriate
- Updates the driver library discoverer to extract and report the libcuda.so parent directory
- Adjusts tests to validate that the new environment variable is being injected into container edits
Reviewed Changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/nvcdi/workarounds-device-folder-permissions.go | Adds EnvVars() method returning nil, consistent with other discoverers |
| pkg/nvcdi/driver-nvml.go | Updates NewDriverLibraryDiscoverer and getVersionLibs to extract the libcuda.so parent directory and append the environment variable |
| internal/platform-support/dgpu/nvsandboxutils.go; internal/platform-support/dgpu/by-path-hooks.go | Implements EnvVars() returning nil, maintaining interface consistency |
| internal/edits/edits.go | Adds processing of EnvVars into container edits |
| internal/discover/* | Updates Discover implementations (none, list, hooks, first-valid, envvar, cache, discover_mock, discover) to support the new EnvVars() interface method |
| cmd/nvidia-ctk/cdi/generate/generate_test.go; cmd/nvidia-ctk-installer/container/toolkit/toolkit_test.go | Updates tests to verify injection of LIBCUDA_SO_PARENT_DIRECTORY_CONTAINER_PATH in container edits |
| @@ -22,6 +22,12 @@ type Device struct { | |||
| Path string | |||
| } | |||
|
|
|||
| // EnvVar represents a discovered environment variable. | |||
| type EnvVar struct { | |||
| Name string | |||
There was a problem hiding this comment.
I am more of a Key/Value mind, but not a blocker.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change adds a LIBCUDA_SO_PARENT_DIRECTORY_CONTAINER_PATH envvar to a generated CDI specification. This reports where the
libcuda.so.*libraries will be injected into the container.Fixes #1028