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

rename dcu-ctk dcu-container-toolkit

parent 0ccfece1
......@@ -8,7 +8,7 @@ import (
"fmt"
"path/filepath"
"strings"
"dtk-container-toolkit/internal/hydcu"
"dcu-container-toolkit/internal/hydcu"
"strconv"
"github.com/opencontainers/runtime-spec/specs-go"
"tags.cncf.io/container-device-interface/pkg/parser"
......@@ -218,7 +218,7 @@ func (i DTK) CDIDevicesFromMounts() []string {
}
// 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 {
return i.DevicesFromEnvvars(EnvVarDTKVisibleDevices, EnvVarNvidiaVisibleDevices).List()
}
......@@ -5,7 +5,7 @@
package image
const (
EnvVarDTKVisibleDevices = "DTK_VISIBLE_DEVICES"
EnvVarDTKVisibleDevices = "DCU_VISIBLE_DEVICES"
EnvVarNvidiaVisibleDevices = "NVIDIA_VISIBLE_DEVICES"
EnvROCmVersion = "ROCM_VERSION"
)
......@@ -172,11 +172,11 @@ func (t *Toml) commentDefaults() *Toml {
"accept-dtk-visible-devices-as-volume-mounts": false,
"dtk-container-cli.root": "/run/dtk/driver",
"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.no-cgroups": false,
"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 {
set := asToml.Get(k)
......@@ -192,7 +192,7 @@ func shouldComment(key string, defaultValue interface{}, setTo interface{}) bool
if key == "dtk-container-cli.user" && defaultValue == setTo && isSuse() {
return false
}
if key == "dtk-container-runtime.debug" && setTo == "/dev/null" {
if key == "dcu-container-runtime.debug" && setTo == "/dev/null" {
return true
}
if setTo == nil || defaultValue == setTo || setTo == "" {
......
......@@ -4,7 +4,7 @@
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 {
Path string `toml:"path"`
}
package dcuTracker
import (
"dtk-container-toolkit/internal/hydcu"
"dcu-container-toolkit/internal/hydcu"
"encoding/json"
"fmt"
"os"
......
......@@ -5,8 +5,8 @@
package discover
import (
"dtk-container-toolkit/internal/info"
"dtk-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/info"
"dcu-container-toolkit/internal/logger"
"os/user"
"strconv"
)
......
......@@ -5,8 +5,8 @@
package discover
import (
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/lookup"
)
// charDevices is a discover for a list of character devices
......
......@@ -5,8 +5,8 @@
package discover
import (
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/lookup"
"fmt"
"os"
"path/filepath"
......
......@@ -5,7 +5,7 @@
package discover
import (
"dtk-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/logger"
)
// Filter defines an interface for filtering discovered entities
......
......@@ -5,11 +5,11 @@
package discover
import (
"dtk-container-toolkit/internal/config/image"
"dtk-container-toolkit/internal/info/drm"
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup"
"dtk-container-toolkit/internal/lookup/root"
"dcu-container-toolkit/internal/config/image"
"dcu-container-toolkit/internal/info/drm"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/lookup"
"dcu-container-toolkit/internal/lookup/root"
"fmt"
"os"
)
......
......@@ -62,7 +62,7 @@ func CreateDtkTrackHook(path string, s string, s2 string, id string) Hook {
return Hook{
Lifecycle: cdi.PoststopHook,
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 {
}
func (c cdiHook) requiredArgs(name string) []string {
base := filepath.Base(string(c))
if base == "dtk-ctk" {
if base == "dcu-ctk" {
return []string{base, "hook", name}
}
return []string{base, name}
......
......@@ -4,7 +4,7 @@
package discover
import "dtk-container-toolkit/internal/logger"
import "dcu-container-toolkit/internal/logger"
// NewMOFEDDiscoverer creates a discoverer for MOFED devices.
func NewMOFEDDiscoverer(logger logger.Interface, devRoot string) (Discover, error) {
......
......@@ -5,8 +5,8 @@
package discover
import (
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/lookup"
"fmt"
"path/filepath"
"strings"
......
......@@ -5,8 +5,8 @@
package discover
import (
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/lookup"
"fmt"
"path/filepath"
"strings"
......
......@@ -5,8 +5,8 @@
package discover
import (
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/lookup"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/lookup"
"fmt"
"os"
"path/filepath"
......
......@@ -5,7 +5,7 @@
package edits
import (
"dtk-container-toolkit/internal/discover"
"dcu-container-toolkit/internal/discover"
"os"
"tags.cncf.io/container-device-interface/pkg/cdi"
......
......@@ -5,9 +5,9 @@
package edits
import (
"dtk-container-toolkit/internal/discover"
"dtk-container-toolkit/internal/logger"
"dtk-container-toolkit/internal/oci"
"dcu-container-toolkit/internal/discover"
"dcu-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/oci"
"fmt"
"tags.cncf.io/container-device-interface/pkg/cdi"
......
......@@ -5,7 +5,7 @@
package edits
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/specs-go"
......
......@@ -5,7 +5,7 @@
package edits
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/specs-go"
......
......@@ -5,8 +5,8 @@
package info
import (
"dtk-container-toolkit/internal/config/image"
"dtk-container-toolkit/internal/logger"
"dcu-container-toolkit/internal/config/image"
"dcu-container-toolkit/internal/logger"
)
// 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