Skip to content

GitLab

Commit 48c080c4 authored by songlinfeng's avatar songlinfeng
Browse files

rename dcu-ctk dcu-container-toolkit

parent 0ccfece1
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
internal/config/image/dtk_image.go
View file @ 48c080c4
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings" "strings"
"dtk-container-toolkit/internal/hydcu" "dcu-container-toolkit/internal/hydcu"
"strconv" "strconv"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"tags.cncf.io/container-device-interface/pkg/parser" "tags.cncf.io/container-device-interface/pkg/parser"
...@@ -218,7 +218,7 @@ func (i DTK) CDIDevicesFromMounts() []string { ...@@ -218,7 +218,7 @@ func (i DTK) CDIDevicesFromMounts() []string {
} }
// VisibleDevicesFromEnvVar returns the set of visible devices requested through // VisibleDevicesFromEnvVar returns the set of visible devices requested through
// the DTK_VISIBLE_DEVICES environment variable. // the DCU_VISIBLE_DEVICES environment variable.
func (i DTK) VisibleDevicesFromEnvVar() []string { func (i DTK) VisibleDevicesFromEnvVar() []string {
return i.DevicesFromEnvvars(EnvVarDTKVisibleDevices, EnvVarNvidiaVisibleDevices).List() return i.DevicesFromEnvvars(EnvVarDTKVisibleDevices, EnvVarNvidiaVisibleDevices).List()
} }
internal/config/image/envvars.go
View file @ 48c080c4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package image package image
const ( const (
EnvVarDTKVisibleDevices = "DTK_VISIBLE_DEVICES" EnvVarDTKVisibleDevices = "DCU_VISIBLE_DEVICES"
EnvVarNvidiaVisibleDevices = "NVIDIA_VISIBLE_DEVICES" EnvVarNvidiaVisibleDevices = "NVIDIA_VISIBLE_DEVICES"
EnvROCmVersion = "ROCM_VERSION" EnvROCmVersion = "ROCM_VERSION"
) )
internal/config/toml.go
View file @ 48c080c4
...@@ -172,11 +172,11 @@ func (t *Toml) commentDefaults() *Toml { ...@@ -172,11 +172,11 @@ func (t *Toml) commentDefaults() *Toml {
"accept-dtk-visible-devices-as-volume-mounts": false, "accept-dtk-visible-devices-as-volume-mounts": false,
"dtk-container-cli.root": "/run/dtk/driver", "dtk-container-cli.root": "/run/dtk/driver",
"dtk-container-cli.path": "/usr/bin/dtk-container-cli", "dtk-container-cli.path": "/usr/bin/dtk-container-cli",
"dtk-container-cli.debug": "/var/log/dtk-container-toolkit.log", "dtk-container-cli.debug": "/var/log/dcu-container-toolkit.log",
"dtk-container-cli.ldcache": "/etc/ld.so.cache", "dtk-container-cli.ldcache": "/etc/ld.so.cache",
"dtk-container-cli.no-cgroups": false, "dtk-container-cli.no-cgroups": false,
"dtk-container-cli.user": "root:video", "dtk-container-cli.user": "root:video",
"dtk-container-runtime.debug": "/var/log/dtk-container-runtime.log", "dcu-container-runtime.debug": "/var/log/dcu-container-runtime.log",
} }
for k, v := range commentedDefaults { for k, v := range commentedDefaults {
set := asToml.Get(k) set := asToml.Get(k)
...@@ -192,7 +192,7 @@ func shouldComment(key string, defaultValue interface{}, setTo interface{}) bool ...@@ -192,7 +192,7 @@ func shouldComment(key string, defaultValue interface{}, setTo interface{}) bool
if key == "dtk-container-cli.user" && defaultValue == setTo && isSuse() { if key == "dtk-container-cli.user" && defaultValue == setTo && isSuse() {
return false return false
} }
if key == "dtk-container-runtime.debug" && setTo == "/dev/null" { if key == "dcu-container-runtime.debug" && setTo == "/dev/null" {
return true return true
} }
if setTo == nil || defaultValue == setTo || setTo == "" { if setTo == nil || defaultValue == setTo || setTo == "" {
......
internal/config/toolkit-cli.go
View file @ 48c080c4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package config package config
// CTKConfig stores the config options for the DTK Container Toolkit CLI (dtk-ctk) // CTKConfig stores the config options for the DTK Container Toolkit CLI (dcu-ctk)
type CTKConfig struct { type CTKConfig struct {
Path string `toml:"path"` Path string `toml:"path"`
} }
internal/dcu-tracker/dcu-tracker.go
View file @ 48c080c4
package dcuTracker package dcuTracker
import ( import (
"dtk-container-toolkit/internal/hydcu" "dcu-container-toolkit/internal/hydcu"
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
......
internal/discover/addtional_gids.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/info" "dcu-container-toolkit/internal/info"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"os/user" "os/user"
"strconv" "strconv"
) )
......
internal/discover/char_devices.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
) )
// charDevices is a discover for a list of character devices // charDevices is a discover for a list of character devices
......
internal/discover/drm_bypath_hooks.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
......
internal/discover/filter.go
View file @ 48c080c4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
) )
// Filter defines an interface for filtering discovered entities // Filter defines an interface for filtering discovered entities
......
internal/discover/graphics.go
View file @ 48c080c4
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/config/image" "dcu-container-toolkit/internal/config/image"
"dtk-container-toolkit/internal/info/drm" "dcu-container-toolkit/internal/info/drm"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"dtk-container-toolkit/internal/lookup/root" "dcu-container-toolkit/internal/lookup/root"
"fmt" "fmt"
"os" "os"
) )
......
internal/discover/hooks.go
View file @ 48c080c4
...@@ -62,7 +62,7 @@ func CreateDtkTrackHook(path string, s string, s2 string, id string) Hook { ...@@ -62,7 +62,7 @@ func CreateDtkTrackHook(path string, s string, s2 string, id string) Hook {
return Hook{ return Hook{
Lifecycle: cdi.PoststopHook, Lifecycle: cdi.PoststopHook,
Path: path, Path: path,
Args: []string{"dtk-ctk", s, s2, id}, Args: []string{"dcu-ctk", s, s2, id},
} }
} }
...@@ -82,7 +82,7 @@ func (c cdiHook) Create(name string, args ...string) Hook { ...@@ -82,7 +82,7 @@ func (c cdiHook) Create(name string, args ...string) Hook {
} }
func (c cdiHook) requiredArgs(name string) []string { func (c cdiHook) requiredArgs(name string) []string {
base := filepath.Base(string(c)) base := filepath.Base(string(c))
if base == "dtk-ctk" { if base == "dcu-ctk" {
return []string{base, "hook", name} return []string{base, "hook", name}
} }
return []string{base, name} return []string{base, name}
......
internal/discover/mofed.go
View file @ 48c080c4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package discover package discover
import "dtk-container-toolkit/internal/logger" import "dcu-container-toolkit/internal/logger"
// NewMOFEDDiscoverer creates a discoverer for MOFED devices. // NewMOFEDDiscoverer creates a discoverer for MOFED devices.
func NewMOFEDDiscoverer(logger logger.Interface, devRoot string) (Discover, error) { func NewMOFEDDiscoverer(logger logger.Interface, devRoot string) (Discover, error) {
......
internal/discover/mounts-to-container-path.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings" "strings"
......
internal/discover/mounts.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings" "strings"
......
internal/discover/pci_mounts.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package discover package discover
import ( import (
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup" "dcu-container-toolkit/internal/lookup"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
......
internal/edits/device.go
View file @ 48c080c4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package edits package edits
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"os" "os"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
......
internal/edits/edits.go
View file @ 48c080c4
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
package edits package edits
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/oci" "dcu-container-toolkit/internal/oci"
"fmt" "fmt"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
......
internal/edits/hook.go
View file @ 48c080c4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package edits package edits
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
......
internal/edits/mount.go
View file @ 48c080c4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
package edits package edits
import ( import (
"dtk-container-toolkit/internal/discover" "dcu-container-toolkit/internal/discover"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
......
internal/info/auto.go
View file @ 48c080c4
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
package info package info
import ( import (
"dtk-container-toolkit/internal/config/image" "dcu-container-toolkit/internal/config/image"
"dtk-container-toolkit/internal/logger" "dcu-container-toolkit/internal/logger"
) )
// ResolveAutoMode determines the correct mode for the platform if set to "auto" // ResolveAutoMode determines the correct mode for the platform if set to "auto"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment