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

Revert "Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_*"

Browse Source 
This reverts commit 01b4381282.
This commit is contained in:
Kevin Klues 2020-07-20 14:13:49 +00:00
parent cc0a22a6d9
commit da6fbb343a
8 changed files with 22 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.toml.amzn
View File

@ -11,7 +11,6 @@ load-kmods = true
#no-cgroups = false #no-cgroups = false
#user = "root:video" #user = "root:video"
ldconfig = "@/sbin/ldconfig" ldconfig = "@/sbin/ldconfig"
#alpha-merge-visible-devices-envvars = false
[nvidia-container-runtime] [nvidia-container-runtime]
#debug = "/var/log/nvidia-container-runtime.log" #debug = "/var/log/nvidia-container-runtime.log"

1
config/config.toml.centos
View File

@ -11,7 +11,6 @@ load-kmods = true
#no-cgroups = false #no-cgroups = false
#user = "root:video" #user = "root:video"
ldconfig = "@/sbin/ldconfig" ldconfig = "@/sbin/ldconfig"
#alpha-merge-visible-devices-envvars = false
[nvidia-container-runtime] [nvidia-container-runtime]
#debug = "/var/log/nvidia-container-runtime.log" #debug = "/var/log/nvidia-container-runtime.log"

1
config/config.toml.debian
View File

@ -11,7 +11,6 @@ load-kmods = true
#no-cgroups = false #no-cgroups = false
#user = "root:video" #user = "root:video"
ldconfig = "@/sbin/ldconfig" ldconfig = "@/sbin/ldconfig"
#alpha-merge-visible-devices-envvars = false
[nvidia-container-runtime] [nvidia-container-runtime]
#debug = "/var/log/nvidia-container-runtime.log" #debug = "/var/log/nvidia-container-runtime.log"

1
config/config.toml.opensuse-leap
View File

@ -11,7 +11,6 @@ load-kmods = true
#no-cgroups = false #no-cgroups = false
user = "root:video" user = "root:video"
ldconfig = "@/sbin/ldconfig" ldconfig = "@/sbin/ldconfig"
#alpha-merge-visible-devices-envvars = false
[nvidia-container-runtime] [nvidia-container-runtime]
#debug = "/var/log/nvidia-container-runtime.log" #debug = "/var/log/nvidia-container-runtime.log"

1
config/config.toml.ubuntu
View File

@ -11,7 +11,6 @@ load-kmods = true
#no-cgroups = false #no-cgroups = false
#user = "root:video" #user = "root:video"
ldconfig = "@/sbin/ldconfig.real" ldconfig = "@/sbin/ldconfig.real"
#alpha-merge-visible-devices-envvars = false
[nvidia-container-runtime] [nvidia-container-runtime]
#debug = "/var/log/nvidia-container-runtime.log" #debug = "/var/log/nvidia-container-runtime.log"

131
container_config_test.go
View File

@ -1,131 +0,0 @@
package main
import (
"github.com/stretchr/testify/require"
"sort"
"strings"
"testing"
)
func TestMergeVisibleDevicesEnvvars(t *testing.T) {
var tests = []struct {
name string
input []string
expected string
enableMerge bool
}{
{
"Simple Merge Enabled",
[]string{
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
},
"0,1,2,3,4,5",
true,
},
{
"Simple Merge Disabled",
[]string{
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
},
"",
false,
},
{
"Merge No Override (Enabled)",
[]string{
"NVIDIA_VISIBLE_DEVICES=all",
},
"all",
true,
},
{
"Merge No Override (Disabled)",
[]string{
"NVIDIA_VISIBLE_DEVICES=all",
},
"all",
false,
},
{
"Merge Override (Enabled, Before)",
[]string{
"NVIDIA_VISIBLE_DEVICES=all",
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
},
"0,1,2,3,4,5",
true,
},
{
"Merge Override (Enabled, After)",
[]string{
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
"NVIDIA_VISIBLE_DEVICES=all",
},
"0,1,2,3,4,5",
true,
},
{
"Merge Override (Enabled, In Between)",
[]string{
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES=all",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
},
"0,1,2,3,4,5",
true,
},
{
"Merge Override (Disabled, Before)",
[]string{
"NVIDIA_VISIBLE_DEVICES=all",
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
},
"all",
false,
},
{
"Merge Override (Disabled, After)",
[]string{
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
"NVIDIA_VISIBLE_DEVICES=all",
},
"all",
false,
},
{
"Merge Override (Disabled, In Between)",
[]string{
"NVIDIA_VISIBLE_DEVICES_0=0,1",
"NVIDIA_VISIBLE_DEVICES_1=2,3",
"NVIDIA_VISIBLE_DEVICES=all",
"NVIDIA_VISIBLE_DEVICES_WHATEVER=4,5",
},
"all",
false,
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
config := CLIConfig{
AlphaMergeVisibleDevicesEnvvars: tc.enableMerge,
}
envvars := getEnvMap(tc.input, config)
devices := strings.Split(envvars[envNVVisibleDevices], ",")
sort.Strings(devices)
require.Equal(t, tc.expected, strings.Join(devices, ","))
})
}
}

15
pkg/container_config.go
View File

@ -108,7 +108,7 @@ func parseCudaVersion(cudaVersion string) (vmaj, vmin, vpatch uint32) {
return return
} }
func getEnvMap(e []string, config CLIConfig) (m map[string]string) { func getEnvMap(e []string) (m map[string]string) {
m = make(map[string]string) m = make(map[string]string)
for _, s := range e { for _, s := range e {
p := strings.SplitN(s, "=", 2) p := strings.SplitN(s, "=", 2)
@ -117,17 +117,6 @@ func getEnvMap(e []string, config CLIConfig) (m map[string]string) {
} }
m[p[0]] = p[1] m[p[0]] = p[1]
} }
if config.AlphaMergeVisibleDevicesEnvvars {
var mergable []string
for k, v := range m {
if strings.HasPrefix(k, envNVVisibleDevices+"_") {
mergable = append(mergable, v)
}
}
if len(mergable) > 0 {
m[envNVVisibleDevices] = strings.Join(mergable, ",")
}
}
return return
} }
@ -357,7 +346,7 @@ func getContainerConfig(hook HookConfig) (config containerConfig) {
s := loadSpec(path.Join(b, "config.json")) s := loadSpec(path.Join(b, "config.json"))
env := getEnvMap(s.Process.Env, hook.NvidiaContainerCLI) env := getEnvMap(s.Process.Env)
privileged := isPrivileged(s) privileged := isPrivileged(s)
envSwarmGPU = hook.SwarmResource envSwarmGPU = hook.SwarmResource
return containerConfig{ return containerConfig{

42
pkg/hook_config.go
View File

@ -20,17 +20,16 @@ var defaultPaths = [...]string{
// CLIConfig : options for nvidia-container-cli. // CLIConfig : options for nvidia-container-cli.
type CLIConfig struct { type CLIConfig struct {
Root *string `toml:"root"` Root *string `toml:"root"`
Path *string `toml:"path"` Path *string `toml:"path"`
Environment []string `toml:"environment"` Environment []string `toml:"environment"`
Debug *string `toml:"debug"` Debug *string `toml:"debug"`
Ldcache *string `toml:"ldcache"` Ldcache *string `toml:"ldcache"`
LoadKmods bool `toml:"load-kmods"` LoadKmods bool `toml:"load-kmods"`
NoPivot bool `toml:"no-pivot"` NoPivot bool `toml:"no-pivot"`
NoCgroups bool `toml:"no-cgroups"` NoCgroups bool `toml:"no-cgroups"`
User *string `toml:"user"` User *string `toml:"user"`
Ldconfig *string `toml:"ldconfig"` Ldconfig *string `toml:"ldconfig"`
AlphaMergeVisibleDevicesEnvvars bool `toml:"alpha-merge-visible-devices-envvars"`
} }
// HookConfig : options for the nvidia-container-toolkit. // HookConfig : options for the nvidia-container-toolkit.
@ -46,17 +45,16 @@ func getDefaultHookConfig() (config HookConfig) {
DisableRequire: false, DisableRequire: false,
SwarmResource: nil, SwarmResource: nil,
NvidiaContainerCLI: CLIConfig{ NvidiaContainerCLI: CLIConfig{
Root: nil, Root: nil,
Path: nil, Path: nil,
Environment: []string{}, Environment: []string{},
Debug: nil, Debug: nil,
Ldcache: nil, Ldcache: nil,
LoadKmods: true, LoadKmods: true,
NoPivot: false, NoPivot: false,
NoCgroups: false, NoCgroups: false,
User: nil, User: nil,
Ldconfig: nil, Ldconfig: nil,
AlphaMergeVisibleDevicesEnvvars: false,
}, },
} }
} }