Merge pull request #1930 from NVIDIA/dependabot/go_modules/main/github.com/NVIDIA/go-nvml-0.13.3-1

build(deps): Bump github.com/NVIDIA/go-nvml from 0.13.3-0 to 0.13.3-1

Author: cdesiniotis

cmd/nvidia-ctk/cdi/generate/generate_test.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/NVIDIA/go-nvml/pkg/nvml"
 	"github.com/NVIDIA/go-nvml/pkg/nvml/mock/dgxa100"
+	mockserver "github.com/NVIDIA/go-nvml/pkg/nvml/mock/server"
 	testlog "github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/require"
 	"tags.cncf.io/container-device-interface/specs-go"
@@ -502,7 +503,7 @@ containerEdits:
 			}
 			for _, d := range server.Devices {
 				// TODO: This is not implemented in the mock.
-				(d.(*dgxa100.Device)).GetMaxMigDeviceCountFunc = func() (int, nvml.Return) {
+				(d.(*mockserver.Device)).GetMaxMigDeviceCountFunc = func() (int, nvml.Return) {
 					return 0, nvml.SUCCESS
 				}
 			}

go.mod

@@ -5,7 +5,7 @@ go 1.25.0
 require (
 	github.com/Masterminds/semver/v3 v3.5.0
 	github.com/NVIDIA/go-nvlib v0.11.0
-	github.com/NVIDIA/go-nvml v0.13.3-0
+	github.com/NVIDIA/go-nvml v0.13.3-1
 	github.com/containerd/nri v0.12.0
 	github.com/cyphar/filepath-securejoin v0.7.0
 	github.com/google/uuid v1.6.0

go.sum

@@ -4,8 +4,8 @@ github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAw
 github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/NVIDIA/go-nvlib v0.11.0 h1:J6c9deWGJ1x4yY7fKg+aOdm2v5+WmCIeCLsuaO3tRtA=
 github.com/NVIDIA/go-nvlib v0.11.0/go.mod h1:uQNH63NoDuSfn/1lixD1D1Hvhko/xdnBHmc4H1mFUlY=
-github.com/NVIDIA/go-nvml v0.13.3-0 h1:oJZ4+VTtPI/XT7XCfo5NvE9XTNrH8I3/KHy89rHxDxY=
-github.com/NVIDIA/go-nvml v0.13.3-0/go.mod h1:ahi2psRYoa+wYUBIrZPRO+wJs9lcvMhxSSkjjvsJJNQ=
+github.com/NVIDIA/go-nvml v0.13.3-1 h1:P76U2h88OZSiMtdhRsJjSF5DXyXUqHIXKeDicVAaae0=
+github.com/NVIDIA/go-nvml v0.13.3-1/go.mod h1:ahi2psRYoa+wYUBIrZPRO+wJs9lcvMhxSSkjjvsJJNQ=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/brianvoe/gofakeit/v7 v7.12.1 h1:df1tiI4SL1dR5Ix4D/r6a3a+nXBJ/OBGU5jEKRBmmqg=

pkg/nvcdi/lib-nvml_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/NVIDIA/go-nvml/pkg/nvml"
 	mocknvml "github.com/NVIDIA/go-nvml/pkg/nvml/mock"
 	"github.com/NVIDIA/go-nvml/pkg/nvml/mock/dgxa100"
+	mockserver "github.com/NVIDIA/go-nvml/pkg/nvml/mock/server"
 	"github.com/stretchr/testify/require"
 
 	"github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
@@ -32,7 +33,7 @@ func TestNvmllibGetDeviceSpecGeneratorsForIDs(t *testing.T) {
 	testCases := []struct {
 		name               string
 		ids                []string
-		setupMock          func(*dgxa100.Server)
+		setupMock          func(*mockserver.Server)
 		expectedError      error
 		expectedLength     int
 		expectedGenerators DeviceSpecGenerators
@@ -46,10 +47,10 @@ func TestNvmllibGetDeviceSpecGeneratorsForIDs(t *testing.T) {
 		{
 			name: "single GPU index",
 			ids:  []string{"0"},
-			setupMock: func(server *dgxa100.Server) {
+			setupMock: func(server *mockserver.Server) {
 				for _, d := range server.Devices {
 					// TODO: This is not implemented in the mock.
-					(d.(*dgxa100.Device)).IsMigDeviceHandleFunc = func() (bool, nvml.Return) {
+					(d.(*mockserver.Device)).IsMigDeviceHandleFunc = func() (bool, nvml.Return) {
 						return false, nvml.SUCCESS
 					}
 				}
@@ -60,10 +61,10 @@ func TestNvmllibGetDeviceSpecGeneratorsForIDs(t *testing.T) {
 		{
 			name: "single UUID",
 			ids:  []string{"GPU-12345678-1234-1234-1234-123456789abc"},
-			setupMock: func(server *dgxa100.Server) {
+			setupMock: func(server *mockserver.Server) {
 				for _, d := range server.Devices {
 					// TODO: This is not implemented in the mock.
-					(d.(*dgxa100.Device)).IsMigDeviceHandleFunc = func() (bool, nvml.Return) {
+					(d.(*mockserver.Device)).IsMigDeviceHandleFunc = func() (bool, nvml.Return) {
 						return false, nvml.SUCCESS
 					}
 				}
@@ -80,7 +81,7 @@ func TestNvmllibGetDeviceSpecGeneratorsForIDs(t *testing.T) {
 		{
 			name: "MIG device index",
 			ids:  []string{"0:0"},
-			setupMock: func(server *dgxa100.Server) {
+			setupMock: func(server *mockserver.Server) {
 				mig := &mocknvml.Device{
 					IsMigDeviceHandleFunc: func() (bool, nvml.Return) {
 						return true, nvml.SUCCESS
@@ -96,7 +97,7 @@ func TestNvmllibGetDeviceSpecGeneratorsForIDs(t *testing.T) {
 					},
 				}
 
-				server.Devices[0].(*dgxa100.Device).GetMigDeviceHandleByIndexFunc = func(n int) (nvml.Device, nvml.Return) {
+				server.Devices[0].(*mockserver.Device).GetMigDeviceHandleByIndexFunc = func(n int) (nvml.Device, nvml.Return) {
 					if n != 0 {
 						return nil, nvml.ERROR_INVALID_ARGUMENT
 					}
@@ -143,17 +144,17 @@ func TestNvmllibGetDeviceSpecGeneratorsForIDs(t *testing.T) {
 }
 
 // TODO: These need to be implemented in go-nvlib
-func mockOverrides(server *dgxa100.Server) {
+func mockOverrides(server *mockserver.Server) {
 	for i, d := range server.Devices {
 		// TODO: This is not implemented in the mock.
-		(d.(*dgxa100.Device)).GetMaxMigDeviceCountFunc = func() (int, nvml.Return) {
+		(d.(*mockserver.Device)).GetMaxMigDeviceCountFunc = func() (int, nvml.Return) {
 			return 0, nvml.SUCCESS
 		}
-		(d.(*dgxa100.Device)).GetIndexFunc = func() (int, nvml.Return) {
+		(d.(*mockserver.Device)).GetIndexFunc = func() (int, nvml.Return) {
 			return i, nvml.SUCCESS
 		}
-		(d.(*dgxa100.Device)).GetUUIDFunc = func() (string, nvml.Return) {
-			return d.(*dgxa100.Device).UUID, nvml.SUCCESS
+		(d.(*mockserver.Device)).GetUUIDFunc = func() (string, nvml.Return) {
+			return d.(*mockserver.Device).UUID, nvml.SUCCESS
 		}
 	}
 }