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 tags.cncf.io for CDI imports

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar
2023-11-01 12:40:51 +01:00
parent c5a9ed6594
commit e56bb09889
44 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/nvidia-ctk/README.md
View File

@@ -43,7 +43,7 @@ By default, all commands output to `STDOUT`, but specifying the `--output` flag
### Generate CDI specifications ### Generate CDI specifications
The [Container Device Interface (CDI)](https://github.com/container-orchestrated-devices/container-device-interface) provides The [Container Device Interface (CDI)](https://tags.cncf.io/container-device-interface) provides
a vendor-agnostic mechanism to make arbitrary devices accessible in containerized environments. To allow NVIDIA devices to be a vendor-agnostic mechanism to make arbitrary devices accessible in containerized environments. To allow NVIDIA devices to be
used in these environments, the NVIDIA Container Toolkit CLI includes functionality to generate a CDI specification for the used in these environments, the NVIDIA Container Toolkit CLI includes functionality to generate a CDI specification for the
available NVIDIA GPUs in a system. available NVIDIA GPUs in a system.

2
cmd/nvidia-ctk/cdi/generate/generate.go
View File

@@ -28,8 +28,8 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
cdi "github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
cdi "tags.cncf.io/container-device-interface/pkg/parser"
) )
const ( const (

2
cmd/nvidia-ctk/cdi/list/list.go
View File

@@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"tags.cncf.io/container-device-interface/pkg/cdi"
) )
type command struct { type command struct {

2
cmd/nvidia-ctk/cdi/transform/root/root.go
View File

@@ -24,8 +24,8 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"tags.cncf.io/container-device-interface/pkg/cdi"
) )
type command struct { type command struct {

2
internal/config/config.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
) )
const ( const (

2
internal/config/image/cuda_image.go
View File

@@ -22,9 +22,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/mod/semver" "golang.org/x/mod/semver"
"tags.cncf.io/container-device-interface/pkg/parser"
) )
const ( const (

2
internal/discover/hooks.go
View File

@@ -19,7 +19,7 @@ package discover
import ( import (
"path/filepath" "path/filepath"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
) )
var _ Discover = (*Hook)(nil) var _ Discover = (*Hook)(nil)

4
internal/edits/device.go
View File

@@ -18,8 +18,8 @@ package edits
import ( import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type device discover.Device type device discover.Device

2
internal/edits/device_test.go
View File

@@ -21,8 +21,8 @@ import (
"testing" "testing"
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"tags.cncf.io/container-device-interface/specs-go"
) )
func TestDeviceToSpec(t *testing.T) { func TestDeviceToSpec(t *testing.T) {

4
internal/edits/edits.go
View File

@@ -22,9 +22,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
ociSpecs "github.com/opencontainers/runtime-spec/specs-go" ociSpecs "github.com/opencontainers/runtime-spec/specs-go"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type edits struct { type edits struct {

4
internal/edits/hook.go
View File

@@ -18,8 +18,8 @@ package edits
import ( import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type hook discover.Hook type hook discover.Hook

4
internal/edits/mount.go
View File

@@ -18,8 +18,8 @@ package edits
import ( import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type mount discover.Mount type mount discover.Mount

2
internal/modifier/cdi.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/modifier/cdi" "github.com/NVIDIA/nvidia-container-toolkit/internal/modifier/cdi"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser" "tags.cncf.io/container-device-interface/pkg/parser"
) )
// NewCDIModifier creates an OCI spec modifier that determines the modifications to make based on the // NewCDIModifier creates an OCI spec modifier that determines the modifications to make based on the

4
internal/modifier/cdi/builder.go
View File

@@ -21,8 +21,8 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type builder struct { type builder struct {

2
internal/modifier/cdi/registry.go
View File

@@ -22,8 +22,8 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"tags.cncf.io/container-device-interface/pkg/cdi"
) )
// fromRegistry represents the modifications performed using a CDI registry. // fromRegistry represents the modifications performed using a CDI registry.

2
internal/modifier/cdi/spec.go
View File

@@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"tags.cncf.io/container-device-interface/pkg/cdi"
) )
// fromCDISpec represents the modifications performed from a raw CDI spec. // fromCDISpec represents the modifications performed from a raw CDI spec.

4
pkg/nvcdi/api.go
View File

@@ -18,9 +18,9 @@ package nvcdi
import ( import (
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
const ( const (

4
pkg/nvcdi/full-gpu-nvml.go
View File

@@ -26,10 +26,10 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/internal/info/drm" "github.com/NVIDIA/nvidia-container-toolkit/internal/info/drm"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
// GetGPUDeviceSpecs returns the CDI device specs for the full GPU represented by 'device'. // GetGPUDeviceSpecs returns the CDI device specs for the full GPU represented by 'device'.

4
pkg/nvcdi/gds.go
View File

@@ -22,9 +22,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type gdslib nvcdilib type gdslib nvcdilib

4
pkg/nvcdi/lib-csv.go
View File

@@ -23,9 +23,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra" "github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type csvlib nvcdilib type csvlib nvcdilib

4
pkg/nvcdi/lib-nvml.go
View File

@@ -21,10 +21,10 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type nvmllib nvcdilib type nvmllib nvcdilib

4
pkg/nvcdi/lib-wsl.go
View File

@@ -21,9 +21,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type wsllib nvcdilib type wsllib nvcdilib

4
pkg/nvcdi/management.go
View File

@@ -25,9 +25,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/cuda" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/cuda"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type managementlib nvcdilib type managementlib nvcdilib

4
pkg/nvcdi/mig-device-nvml.go
View File

@@ -23,10 +23,10 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/nvcaps" "github.com/NVIDIA/nvidia-container-toolkit/internal/nvcaps"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
// GetMIGDeviceSpecs returns the CDI device specs for the full GPU represented by 'device'. // GetMIGDeviceSpecs returns the CDI device specs for the full GPU represented by 'device'.

4
pkg/nvcdi/mofed.go
View File

@@ -22,9 +22,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device" "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go"
) )
type mofedlib nvcdilib type mofedlib nvcdilib

2
pkg/nvcdi/spec/api.go
View File

@@ -19,7 +19,7 @@ package spec
import ( import (
"io" "io"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
const ( const (

6
pkg/nvcdi/spec/builder.go
View File

@@ -21,9 +21,9 @@ import (
"os" "os"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser" "tags.cncf.io/container-device-interface/pkg/parser"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type builder struct { type builder struct {

4
pkg/nvcdi/spec/spec.go
View File

@@ -22,8 +22,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type spec struct { type spec struct {

2
pkg/nvcdi/transform/api.go
View File

@@ -16,7 +16,7 @@
package transform package transform
import "github.com/container-orchestrated-devices/container-device-interface/specs-go" import "tags.cncf.io/container-device-interface/specs-go"
// Transformer defines the API for applying arbitrary transforms to a spec in-place // Transformer defines the API for applying arbitrary transforms to a spec in-place
type Transformer interface { type Transformer interface {

2
pkg/nvcdi/transform/deduplicate.go
View File

@@ -17,7 +17,7 @@
package transform package transform
import ( import (
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type dedupe struct{} type dedupe struct{}

2
pkg/nvcdi/transform/deduplicate_test.go
View File

@@ -19,8 +19,8 @@ package transform
import ( import (
"testing" "testing"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"tags.cncf.io/container-device-interface/specs-go"
) )
func TestDeduplicate(t *testing.T) { func TestDeduplicate(t *testing.T) {

2
pkg/nvcdi/transform/edits.go
View File

@@ -20,7 +20,7 @@ package transform
import ( import (
"encoding/json" "encoding/json"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type containerEdits specs.ContainerEdits type containerEdits specs.ContainerEdits

2
pkg/nvcdi/transform/merge.go
View File

@@ -16,7 +16,7 @@
package transform package transform
import "github.com/container-orchestrated-devices/container-device-interface/specs-go" import "tags.cncf.io/container-device-interface/specs-go"
type merged []Transformer type merged []Transformer

6
pkg/nvcdi/transform/merged-device.go
View File

@@ -21,9 +21,9 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/edits" "github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser" "tags.cncf.io/container-device-interface/pkg/parser"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
const ( const (

2
pkg/nvcdi/transform/merged-device_test.go
View File

@@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"tags.cncf.io/container-device-interface/specs-go"
) )
func TestMergeDeviceSpecs(t *testing.T) { func TestMergeDeviceSpecs(t *testing.T) {

2
pkg/nvcdi/transform/no-op.go
View File

@@ -17,7 +17,7 @@
package transform package transform
import ( import (
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type noop struct{} type noop struct{}

2
pkg/nvcdi/transform/remove.go
View File

@@ -19,7 +19,7 @@ package transform
import ( import (
"fmt" "fmt"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type remove map[string]bool type remove map[string]bool

2
pkg/nvcdi/transform/root.go
View File

@@ -21,7 +21,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type rootTransformer struct { type rootTransformer struct {

2
pkg/nvcdi/transform/root_test.go
View File

@@ -19,8 +19,8 @@ package transform
import ( import (
"testing" "testing"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"tags.cncf.io/container-device-interface/specs-go"
) )
func TestRootTransformer(t *testing.T) { func TestRootTransformer(t *testing.T) {

2
pkg/nvcdi/transform/simplify.go
View File

@@ -19,7 +19,7 @@ package transform
import ( import (
"fmt" "fmt"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type simplify struct{} type simplify struct{}

2
pkg/nvcdi/transform/simplify_test.go
View File

@@ -19,8 +19,8 @@ package transform
import ( import (
"testing" "testing"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"tags.cncf.io/container-device-interface/specs-go"
) )
func TestSimplify(t *testing.T) { func TestSimplify(t *testing.T) {

2
pkg/nvcdi/transform/sorter.go
View File

@@ -22,7 +22,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/container-orchestrated-devices/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"
) )
type sorter struct{} type sorter struct{}

2
pkg/nvcdi/transform/sorter_test.go
View File

@@ -19,8 +19,8 @@ package transform
import ( import (
"testing" "testing"
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"tags.cncf.io/container-device-interface/specs-go"
) )
func TestSortSpec(t *testing.T) { func TestSortSpec(t *testing.T) {

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

@@ -26,11 +26,11 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvdevices" "github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvdevices"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
toml "github.com/pelletier/go-toml" toml "github.com/pelletier/go-toml"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/pkg/parser"
) )
const ( const (