Fix cdi mode resolution #428
Merged
Conversation
This file contains 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
elezar
force-pushed
the
fix-cdi-mode-resolution
branch
from
21c5d69
to
035af48
Compare
elezar
force-pushed
the
fix-cdi-mode-resolution
branch
from
035af48
to
ec1fae1
Compare
elezar
force-pushed
the
fix-cdi-mode-resolution
branch
from
ec1fae1
to
a57badd
Compare
elezar
force-pushed
the
fix-cdi-mode-resolution
branch
from
a57badd
to
65a6ecb
Compare
cdesiniotis
reviewed
Apr 23, 2024
| switch nvinfo.ResolvePlatform() { | ||
| case info.PlatformNVML, info.PlatformWSL: | ||
| return "legacy" | ||
| case info.PlatformTegra: |
There was a problem hiding this comment.
Question -- this case aligns with the original conditional because usesNVGPUModule will only be true on a Tegra platform, correct?
There was a problem hiding this comment.
Yes, the logic for checking the use of the nvgpu module has been pulled into the platform check. PlatformTegra now means that either the Tegra sysfs files are present and NVML is not, or NVML is present and the nvgpu module is used.
elezar
force-pushed
the
fix-cdi-mode-resolution
branch
from
65a6ecb
to
8824828
Compare
pkg/nvcdi/lib.go
Outdated
| @@ -180,30 +185,23 @@ func (m *wrapper) GetCommonEdits() (*cdi.ContainerEdits, error) { | |||
|
|
|||
| // resolveMode resolves the mode for CDI spec generation based on the current system. | |||
| func (l *nvcdilib) resolveMode() (rmode string) { | |||
| if l.mode != ModeAuto { | |||
| if l.mode != "auto" { | |||
There was a problem hiding this comment.
Why moving away from a const var, isn't that preferred?
internal/info/auto_test.go
Outdated
| @@ -23,6 +23,8 @@ import ( | |||
| testlog "github.com/sirupsen/logrus/hooks/test" | |||
| "github.com/stretchr/testify/require" | |||
|
|
|||
| "github.com/NVIDIA/go-nvlib/pkg/nvlib/info" | |||
|
|
|||
There was a problem hiding this comment.
is this extra line wanted/needed?
Signed-off-by: Evan Lezar <elezar@nvidia.com>
Signed-off-by: Evan Lezar <elezar@nvidia.com>
elezar
force-pushed
the
fix-cdi-mode-resolution
branch
from
8824828
to
52d0383
Compare
ArangoGutierrez
approved these changes
May 21, 2024
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 incorporates the changes from NVIDIA/go-nvlib#28 to make the mode resolution consistent.
This ensures that CDI spec generation works on Tegra-based systems where nvml is present.