Merge pull request #516 from elezar/update-infolib-construction

Update infolib construction
NVIDIA · May 28, 2024 · e4b46a0 · e4b46a0
2 parents b407109 + 8fc4b9c
commit e4b46a0
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/NVIDIA/nvidia-container-toolkit
 go 1.20
 
 require (
-	github.com/NVIDIA/go-nvlib v0.4.0
+	github.com/NVIDIA/go-nvlib v0.5.0
 	github.com/NVIDIA/go-nvml v0.12.0-6
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/opencontainers/runtime-spec v1.2.0

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/NVIDIA/go-nvlib v0.4.0 h1:dvuqjjSamBODFuxttPg4H/xtNVQRZOSlwFtuNKybcGI=
-github.com/NVIDIA/go-nvlib v0.4.0/go.mod h1:87z49ULPr4GWPSGfSIp3taU4XENRYN/enIg88MzcL4k=
+github.com/NVIDIA/go-nvlib v0.5.0 h1:951KGrfr+p3cs89alO9z/ZxPPWKxwht9tx9rxiADoLI=
+github.com/NVIDIA/go-nvlib v0.5.0/go.mod h1:87z49ULPr4GWPSGfSIp3taU4XENRYN/enIg88MzcL4k=
 github.com/NVIDIA/go-nvml v0.12.0-6 h1:FJYc2KrpvX+VOC/8QQvMiQMmZ/nPMRpdJO/Ik4xfcr0=
 github.com/NVIDIA/go-nvml v0.12.0-6/go.mod h1:8Llmj+1Rr+9VGGwZuRer5N/aCjxGuR5nPb/9ebBiIEQ=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=

diff --git a/internal/info/additional_info_test.go b/internal/info/additional_info_test.go
@@ -243,7 +243,7 @@ func TestUsesNVGPUModule(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			sut := additionalInfo{
 				nvmllib:   tc.nvmllib,
-				devicelib: device.New(device.WithNvml(tc.nvmllib)),
+				devicelib: device.New(tc.nvmllib),
 			}
 
 			flag, _ := sut.UsesNVGPUModule()

diff --git a/pkg/nvcdi/lib.go b/pkg/nvcdi/lib.go
@@ -99,7 +99,7 @@ func New(opts ...Option) (Interface, error) {
 		l.nvmllib = nvml.New()
 	}
 	if l.devicelib == nil {
-		l.devicelib = device.New(device.WithNvml(l.nvmllib))
+		l.devicelib = device.New(l.nvmllib)
 	}
 	if l.infolib == nil {
 		l.infolib = info.New(

diff --git a/pkg/nvcdi/options.go b/pkg/nvcdi/options.go
@@ -18,6 +18,7 @@ package nvcdi
 
 import (
 	"github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
+	"github.com/NVIDIA/go-nvlib/pkg/nvlib/info"
 	"github.com/NVIDIA/go-nvml/pkg/nvml"
 
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
@@ -34,6 +35,13 @@ func WithDeviceLib(devicelib device.Interface) Option {
 	}
 }
 
+// WithInfoLib sets the info library for CDI spec generation.
+func WithInfoLib(infolib info.Interface) Option {
+	return func(l *nvcdilib) {
+		l.infolib = infolib
+	}
+}
+
 // WithDeviceNamers sets the device namer for the library
 func WithDeviceNamers(namers ...DeviceNamer) Option {
 	return func(l *nvcdilib) {

diff --git a/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/api.go b/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/api.go
diff --git a/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/device.go b/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/device.go
diff --git a/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/mig_device.go b/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/device/mig_device.go
diff --git a/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/info/builder.go b/vendor/github.com/NVIDIA/go-nvlib/pkg/nvlib/info/builder.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/NVIDIA/go-nvlib v0.4.0
+# github.com/NVIDIA/go-nvlib v0.5.0
 ## explicit; go 1.20
 github.com/NVIDIA/go-nvlib/pkg/nvlib/device
 github.com/NVIDIA/go-nvlib/pkg/nvlib/info