UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-06-26 18:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use nvidia-container-runtime.experimental as wrapper

Browse Source 
This change switches to using nvidia-container-runtime.experimental as the
wrapper name over nvidia-container-runtime-experimental. This is consistent
with upcoming mode-specific binaries.

The wrapper is created at nvidia-container-runtime.experimental.real.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar
2023-02-24 17:16:27 +02:00
parent 9435343541
commit ec8a92c17f
10 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/container/docker/docker.go
View File

@@ -36,7 +36,7 @@ const (
nvidiaRuntimeName = "nvidia"
nvidiaRuntimeBinary = "nvidia-container-runtime"
nvidiaExperimentalRuntimeName = "nvidia-experimental"
nvidiaExperimentalRuntimeBinary = "nvidia-container-runtime-experimental"
nvidiaExperimentalRuntimeBinary = "nvidia-container-runtime.experimental"
defaultConfig = "/etc/docker/daemon.json"
defaultSocket = "/var/run/docker.sock"
@@ -261,7 +261,7 @@ func UpdateConfig(config map[string]interface{}, o *options) error {
return nil
}
//RevertConfig reverts the docker config to remove the nvidia runtime
// RevertConfig reverts the docker config to remove the nvidia runtime
func RevertConfig(config map[string]interface{}) error {
if _, exists := config["default-runtime"]; exists {
defaultRuntime := config["default-runtime"].(string)

18
tools/container/docker/docker_test.go
View File

@@ -89,7 +89,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -106,7 +106,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -123,7 +123,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -146,7 +146,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -172,7 +172,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -192,7 +192,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -212,7 +212,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -240,7 +240,7 @@ func TestUpdateConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},
@@ -306,7 +306,7 @@ func TestRevertConfig(t *testing.T) {
"args": []string{},
},
"nvidia-experimental": map[string]interface{}{
"path": "/test/runtime/dir/nvidia-container-runtime-experimental",
"path": "/test/runtime/dir/nvidia-container-runtime.experimental",
"args": []string{},
},
},