UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 16:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename --discovery-mode to --mode

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2023-03-06 11:00:12 +02:00
parent 19c20bb422
commit 20d3bb189b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/nvidia-ctk/cdi/generate/generate.go
View File

@ -48,7 +48,7 @@ type config struct {
deviceNameStrategy string deviceNameStrategy string
driverRoot string driverRoot string
nvidiaCTKPath string nvidiaCTKPath string
discoveryMode string mode string
} }
// NewCommand constructs a generate-cdi command with the specified logger // NewCommand constructs a generate-cdi command with the specified logger
@ -88,10 +88,11 @@ func (m command) build() *cli.Command {
Destination: &cfg.format, Destination: &cfg.format,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "discovery-mode", Name: "mode",
Aliases: []string{"discovery-mode"},
Usage: "The mode to use when discovering the available entities. One of [auto | nvml | wsl]. If mode is set to 'auto' the mode will be determined based on the system configuration.", Usage: "The mode to use when discovering the available entities. One of [auto | nvml | wsl]. If mode is set to 'auto' the mode will be determined based on the system configuration.",
Value: nvcdi.ModeAuto, Value: nvcdi.ModeAuto,
Destination: &cfg.discoveryMode, Destination: &cfg.mode,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "device-name-strategy", Name: "device-name-strategy",
@ -124,13 +125,13 @@ func (m command) validateFlags(c *cli.Context, cfg *config) error {
return fmt.Errorf("invalid output format: %v", cfg.format) return fmt.Errorf("invalid output format: %v", cfg.format)
} }
cfg.discoveryMode = strings.ToLower(cfg.discoveryMode) cfg.mode = strings.ToLower(cfg.mode)
switch cfg.discoveryMode { switch cfg.mode {
case nvcdi.ModeAuto: case nvcdi.ModeAuto:
case nvcdi.ModeNvml: case nvcdi.ModeNvml:
case nvcdi.ModeWsl: case nvcdi.ModeWsl:
default: default:
return fmt.Errorf("invalid discovery mode: %v", cfg.discoveryMode) return fmt.Errorf("invalid discovery mode: %v", cfg.mode)
} }
_, err := nvcdi.NewDeviceNamer(cfg.deviceNameStrategy) _, err := nvcdi.NewDeviceNamer(cfg.deviceNameStrategy)
@ -203,7 +204,7 @@ func (m command) generateSpec(cfg *config) (spec.Interface, error) {
nvcdi.WithDeviceNamer(deviceNamer), nvcdi.WithDeviceNamer(deviceNamer),
nvcdi.WithDeviceLib(devicelib), nvcdi.WithDeviceLib(devicelib),
nvcdi.WithNvmlLib(nvmllib), nvcdi.WithNvmlLib(nvmllib),
nvcdi.WithMode(string(cfg.discoveryMode)), nvcdi.WithMode(string(cfg.mode)),
) )
deviceSpecs, err := cdilib.GetAllDeviceSpecs() deviceSpecs, err := cdilib.GetAllDeviceSpecs()