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

Revert "Add support for NVIDIA_FABRIC_DEVICES"

Browse Source 
This reverts commit f828efcf64.
This commit is contained in:
Evan Lezar 2021-08-18 15:17:59 +02:00
parent 620bd806e8
commit c2ac6db43b
3 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/nvidia-container-toolkit/container_config.go
View File

@ -23,7 +23,6 @@ const (
envNVVisibleDevices = "NVIDIA_VISIBLE_DEVICES" envNVVisibleDevices = "NVIDIA_VISIBLE_DEVICES"
envNVMigConfigDevices = "NVIDIA_MIG_CONFIG_DEVICES" envNVMigConfigDevices = "NVIDIA_MIG_CONFIG_DEVICES"
envNVMigMonitorDevices = "NVIDIA_MIG_MONITOR_DEVICES" envNVMigMonitorDevices = "NVIDIA_MIG_MONITOR_DEVICES"
envNVFabricDevices = "NVIDIA_FABRIC_DEVICES"
envNVDriverCapabilities = "NVIDIA_DRIVER_CAPABILITIES" envNVDriverCapabilities = "NVIDIA_DRIVER_CAPABILITIES"
) )
@ -44,7 +43,6 @@ type nvidiaConfig struct {
Devices string Devices string
MigConfigDevices string MigConfigDevices string
MigMonitorDevices string MigMonitorDevices string
FabricDevices string
DriverCapabilities string DriverCapabilities string
Requirements []string Requirements []string
DisableRequire bool DisableRequire bool
@ -318,13 +316,6 @@ func getMigMonitorDevices(env map[string]string) *string {
return nil return nil
} }
func getFabricDevices(env map[string]string) *string {
if devices, ok := env[envNVFabricDevices]; ok {
return &devices
}
return nil
}
func getDriverCapabilities(env map[string]string, legacyImage bool) *string { func getDriverCapabilities(env map[string]string, legacyImage bool) *string {
// Grab a reference to the capabilities from the envvar // Grab a reference to the capabilities from the envvar
// if it actually exists in the environment. // if it actually exists in the environment.
@ -403,11 +394,6 @@ func getNvidiaConfig(hookConfig *HookConfig, env map[string]string, mounts []Mou
driverCapabilities = *c driverCapabilities = *c
} }
var nvFabricDevices string
if d := getFabricDevices(env); d != nil {
nvFabricDevices = *d
}
requirements := getRequirements(env, legacyImage) requirements := getRequirements(env, legacyImage)
// Don't fail on invalid values. // Don't fail on invalid values.
@ -417,7 +403,6 @@ func getNvidiaConfig(hookConfig *HookConfig, env map[string]string, mounts []Mou
Devices: devices, Devices: devices,
MigConfigDevices: migConfigDevices, MigConfigDevices: migConfigDevices,
MigMonitorDevices: migMonitorDevices, MigMonitorDevices: migMonitorDevices,
FabricDevices: nvFabricDevices,
DriverCapabilities: driverCapabilities, DriverCapabilities: driverCapabilities,
Requirements: requirements, Requirements: requirements,
DisableRequire: disableRequire, DisableRequire: disableRequire,

24
cmd/nvidia-container-toolkit/container_test.go
View File

@ -403,30 +403,6 @@ func TestGetNvidiaConfig(t *testing.T) {
privileged: false, privileged: false,
expectedPanic: true, expectedPanic: true,
}, },
{
description: "fabric devices selected",
env: map[string]string{
envNVVisibleDevices: "all",
envNVFabricDevices: "all",
},
expectedConfig: &nvidiaConfig{
Devices: "all",
FabricDevices: "all",
DriverCapabilities: defaultDriverCapabilities,
},
},
{
description: "fabric devices selected empty",
env: map[string]string{
envNVVisibleDevices: "all",
envNVFabricDevices: "",
},
expectedConfig: &nvidiaConfig{
Devices: "all",
FabricDevices: "",
DriverCapabilities: defaultDriverCapabilities,
},
},
} }
for _, tc := range tests { for _, tc := range tests {
t.Run(tc.description, func(t *testing.T) { t.Run(tc.description, func(t *testing.T) {

3
cmd/nvidia-container-toolkit/main.go
View File

@ -132,9 +132,6 @@ func doPrestart() {
if len(nvidia.MigMonitorDevices) > 0 { if len(nvidia.MigMonitorDevices) > 0 {
args = append(args, fmt.Sprintf("--mig-monitor=%s", nvidia.MigMonitorDevices)) args = append(args, fmt.Sprintf("--mig-monitor=%s", nvidia.MigMonitorDevices))
} }
if len(nvidia.FabricDevices) > 0 {
args = append(args, fmt.Sprintf("--fabric-device=%s", nvidia.FabricDevices))
}
for _, cap := range strings.Split(nvidia.DriverCapabilities, ",") { for _, cap := range strings.Split(nvidia.DriverCapabilities, ",") {
if len(cap) == 0 { if len(cap) == 0 {