rename dcu-ctk dcu-container-toolkit

internal/ldcache/empty.go

@@ -4,7 +4,7 @@
 
 package ldcache
 
-import "dtk-container-toolkit/internal/logger"
+import "dcu-container-toolkit/internal/logger"
 
 type empty struct {
 	logger logger.Interface

internal/ldcache/ldcache.go

@@ -6,8 +6,8 @@ package ldcache
 
 import (
 	"bytes"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/lookup/symlinks"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/lookup/symlinks"
 	"encoding/binary"
 	"errors"
 	"fmt"

internal/lookup/executable.go

@@ -5,7 +5,7 @@
 package lookup
 
 import (
-	"dtk-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/logger"
 	"fmt"
 	"os"
 	"strings"

internal/lookup/file.go

@@ -5,7 +5,7 @@
 package lookup
 
 import (
-	"dtk-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/logger"
 	"fmt"
 	"os"
 	"path/filepath"

internal/lookup/library.go

@@ -5,8 +5,8 @@
 package lookup
 
 import (
-	"dtk-container-toolkit/internal/ldcache"
-	"dtk-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/ldcache"
+	"dcu-container-toolkit/internal/logger"
 	"fmt"
 )
 

internal/lookup/root/options.go

@@ -4,7 +4,7 @@
 
 package root
 
-import "dtk-container-toolkit/internal/logger"
+import "dcu-container-toolkit/internal/logger"
 
 type Option func(*Driver)
 

internal/lookup/root/root.go

@@ -5,8 +5,8 @@
 package root
 
 import (
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/lookup"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/lookup"
 	"os"
 	"path/filepath"
 )

internal/lookup/symlinks.go

@@ -5,7 +5,7 @@
 package lookup
 
 import (
-	"dtk-container-toolkit/internal/lookup/symlinks"
+	"dcu-container-toolkit/internal/lookup/symlinks"
 	"fmt"
 	"path/filepath"
 )

internal/modifier/capabilities.go

@@ -5,8 +5,8 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/oci"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 )

internal/modifier/cdi.go

@@ -5,13 +5,13 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/config"
-	"dtk-container-toolkit/internal/config/image"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/modifier/cdi"
-	"dtk-container-toolkit/internal/oci"
-	"dtk-container-toolkit/pkg/c3000cdi"
-	"dtk-container-toolkit/pkg/c3000cdi/spec"
+	"dcu-container-toolkit/internal/config"
+	"dcu-container-toolkit/internal/config/image"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/modifier/cdi"
+	"dcu-container-toolkit/internal/oci"
+	"dcu-container-toolkit/pkg/c3000cdi"
+	"dcu-container-toolkit/pkg/c3000cdi/spec"
 	"fmt"
 	"strings"
 
@@ -19,7 +19,7 @@ import (
 )
 
 // NewCDIModifier creates an OCI spec modifier that determines the modifications to make based on the
-// CDI specifications available on the system. The DTK_VISIBLE_DEVICES environment variable is
+// CDI specifications available on the system. The DCU_VISIBLE_DEVICES environment variable is
 // used to select the devices to include.
 func NewCDIModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Spec) (oci.SpecModifier, error) {
 	devices, err := getDevicesFromSpec(logger, ociSpec, cfg)
@@ -96,7 +96,7 @@ func getDevicesFromSpec(logger logger.Interface, ociSpec oci.Spec, cfg *config.C
 		return devices, nil
 	}
 
-	logger.Warningf("Ignoring devices specified in DTK_VISIBLE_DEVICES: %v", devices)
+	logger.Warningf("Ignoring devices specified in DCU_VISIBLE_DEVICES: %v", devices)
 
 	return nil, nil
 }

internal/modifier/cdi/builder.go

@@ -5,8 +5,8 @@
 package cdi
 
 import (
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/oci"
 	"fmt"
 
 	"tags.cncf.io/container-device-interface/pkg/cdi"

internal/modifier/cdi/registry.go

@@ -5,8 +5,8 @@
 package cdi
 
 import (
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/oci"
 	"errors"
 	"fmt"
 

internal/modifier/cdi/spec.go

@@ -5,7 +5,7 @@
 package cdi
 
 import (
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/oci"
 	"fmt"
 
 	"github.com/opencontainers/runtime-spec/specs-go"

internal/modifier/copy.go

@@ -6,9 +6,9 @@ package modifier
 
 import (
 	"bytes"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/lookup"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/lookup"
+	"dcu-container-toolkit/internal/oci"
 	"errors"
 	"fmt"
 	"io"

internal/modifier/discover.go

@@ -5,10 +5,10 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/discover"
-	"dtk-container-toolkit/internal/edits"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/discover"
+	"dcu-container-toolkit/internal/edits"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/oci"
 	"fmt"
 
 	"github.com/opencontainers/runtime-spec/specs-go"

internal/modifier/gated.go

@@ -5,12 +5,12 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/config"
-	"dtk-container-toolkit/internal/config/image"
-	"dtk-container-toolkit/internal/discover"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/lookup/root"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/config"
+	"dcu-container-toolkit/internal/config/image"
+	"dcu-container-toolkit/internal/discover"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/lookup/root"
+	"dcu-container-toolkit/internal/oci"
 	"fmt"
 )
 

internal/modifier/graphics.go

@@ -5,14 +5,14 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/config"
-	"dtk-container-toolkit/internal/config/image"
-	"dtk-container-toolkit/internal/dcu-tracker"
-	"dtk-container-toolkit/internal/discover"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/lookup"
-	"dtk-container-toolkit/internal/lookup/root"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/config"
+	"dcu-container-toolkit/internal/config/image"
+	"dcu-container-toolkit/internal/dcu-tracker"
+	"dcu-container-toolkit/internal/discover"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/lookup"
+	"dcu-container-toolkit/internal/lookup/root"
+	"dcu-container-toolkit/internal/oci"
 	"fmt"
 	"path/filepath"
 	"sort"
@@ -24,6 +24,7 @@ import (
 func NewGraphicsModifier(logger logger.Interface, cfg *config.Config, containerImage image.DTK, driver *root.Driver, isMount bool) (oci.SpecModifier, error) {
 	dtkCDIHookPath := cfg.DTKCTKConfig.Path
         value := containerImage.Getenv(image.EnvVarDTKVisibleDevices)
+        
 	if len(value) > 0 {
 	    dcuTracker, err := dcuTracker.New()
 	    if err == nil {
@@ -34,6 +35,19 @@ func NewGraphicsModifier(logger logger.Interface, cfg *config.Config, containerI
 		}
 	    }
 	}
+
+        value = containerImage.Getenv(image.EnvVarNvidiaVisibleDevices)
+        
+        if len(value) > 0 {
+            dcuTracker, err := dcuTracker.New()
+            if err == nil {
+                _, err = dcuTracker.ReserveDCUs(value, containerImage.ContainerId)
+                logger.Infof("ReserveDCUs %s", value)
+                if err != nil {
+                    return nil, fmt.Errorf("failed to reserve DCUs: %v", err)
+                }
+            }
+        }
 	comDiscoverer, err := discover.NewCommonHCUDiscoverer(
 		logger,
 		dtkCDIHookPath,

internal/modifier/hook_remover.go

@@ -5,8 +5,8 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/oci"
 	"path/filepath"
 
 	"github.com/opencontainers/runtime-spec/specs-go"

internal/modifier/list.go

@@ -5,7 +5,7 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/oci"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 )

internal/modifier/stable.go

@@ -5,10 +5,10 @@
 package modifier
 
 import (
-	"dtk-container-toolkit/internal/config"
-	"dtk-container-toolkit/internal/config/image"
-	"dtk-container-toolkit/internal/logger"
-	"dtk-container-toolkit/internal/oci"
+	"dcu-container-toolkit/internal/config"
+	"dcu-container-toolkit/internal/config/image"
+	"dcu-container-toolkit/internal/logger"
+	"dcu-container-toolkit/internal/oci"
 )
 
 // NewStableModifier creates the modifiers for general features.