Handle multiple GPUs in CDI spec generation from CSV #1461
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
Signed-off-by: Evan Lezar <[email protected]>
Signed-off-by: Evan Lezar <[email protected]>
This change updates the way we construct a discoverer for tegra systems to be more flexible in terms of how the SOURCES of the mount specs can be specified. This allows for subsequent changes like adding (or removing) mount specs at the point of construction. Signed-off-by: Evan Lezar <[email protected]>
This change allows CDI specs to be generated for multiple devices when using CSV mode. This can be used in cases where a Tegra-based system consists of an iGPU and dGPU. This behavior can be opted out of using the disable-multiple-csv-devices feature flag. This can be specified by adding the --feaure-flags=disable-multiple-csv-devices command line option to the nvidia-ctk cdi generate command or to the automatic CDI spec generation by adding NVIDIA_CTK_CDI_GENERATE_FEATURE_FLAGS=disable-multiple-csv-devices to the /etc/nvidia-container-toolkit/nvidia-cdi-refresh.env file. Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
dgpu-on-nvgpu
branch
from
2f9fcb8 to
57ef289
Compare
This was referenced Nov 18, 2025
Collaborator
ArangoGutierrez
left a comment
ArangoGutierrez
left a comment
There was a problem hiding this comment.
LGTM, just 2 non-blocking nits
| func (o tegraOptions) newDiscovererFromCSVFiles() (discover.Discover, error) { | ||
| if len(o.csvFiles) == 0 { | ||
| o.logger.Warningf("No CSV files specified") | ||
| func (o options) newDiscovererFromMountSpecs() (discover.Discover, error) { |
Collaborator
There was a problem hiding this comment.
Instead of deleting the func comment, could we update it?
Comment on lines
+48
to
+54
| if l.featureFlags[FeatureDisableMultipleCSVDevices] { | ||
| return l.purecsvDeviceSpecGenerators(ids...) | ||
| } | ||
| hasNVML, _ := l.infolib.HasNvml() | ||
| if !hasNVML { | ||
| return l.purecsvDeviceSpecGenerators(ids...) | ||
| } |
Collaborator
There was a problem hiding this comment.
Nit: this should be in the order that is documented above
// If NVML is not available or the disable-multiple-csv-devices feature flag is
// enabled, a single device is assumed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 allows CDI specs to be generated for multiple
devices when using CSV mode. This can be used in cases where
a Tegra-based system consists of an iGPU and dGPU.
This behavior can be opted out of using the
disable-multiple-csv-devicesfeature flag. This can be specified by adding the
command line option to the nvidia-ctk cdi generate command or to the
automatic CDI spec generation by adding
to the /etc/nvidia-container-toolkit/nvidia-cdi-refresh.env file.