Merge pull request #32 from klueska/update-go-nvml

Update to incorporate go-nvml updates to expose interface types
NVIDIA · Apr 13, 2024 · 094481f · 094481f
2 parents 3c1b6c2 + 153699b
commit 094481f
Show file tree

Hide file tree

Showing 46 changed files with 28,246 additions and 5,694 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/NVIDIA/go-nvlib
 go 1.20
 
 require (
-	github.com/NVIDIA/go-nvml v0.12.0-3
+	github.com/NVIDIA/go-nvml v0.12.0-4
 	github.com/google/uuid v1.6.0
 	github.com/stretchr/testify v1.9.0
 )

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/NVIDIA/go-nvml v0.12.0-3 h1:QwfjYxEqIQVRhl8327g2Y3ZvKResPydpGSKtCIIK9jE=
-github.com/NVIDIA/go-nvml v0.12.0-3/go.mod h1:SOufGc5Wql+cxrIZ8RyJwVKDYxfbs4WPkHXqadcbfvA=
+github.com/NVIDIA/go-nvml v0.12.0-4 h1:BvPjnjJr6qje0zov57Md7TwEA8i/12kZeUQIpyWzTEE=
+github.com/NVIDIA/go-nvml v0.12.0-4/go.mod h1:8Llmj+1Rr+9VGGwZuRer5N/aCjxGuR5nPb/9ebBiIEQ=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

diff --git a/pkg/nvlib/device/api.go b/pkg/nvlib/device/api.go
@@ -17,7 +17,7 @@
 package device
 
 import (
-	"github.com/NVIDIA/go-nvlib/pkg/nvml"
+	"github.com/NVIDIA/go-nvml/pkg/nvml"
 )
 
 // Interface provides the API to the 'device' package.

diff --git a/pkg/nvlib/device/device.go b/pkg/nvlib/device/device.go
@@ -19,7 +19,7 @@ package device
 import (
 	"fmt"
 
-	"github.com/NVIDIA/go-nvlib/pkg/nvml"
+	"github.com/NVIDIA/go-nvml/pkg/nvml"
 )
 
 // Device defines the set of extended functions associated with a device.Device.
@@ -469,5 +469,5 @@ func (d *devicelib) hasSymbol(symbol string) bool {
 		return true
 	}
 
-	return d.nvml.Lookup(symbol) == nil
+	return d.nvml.Extensions().LookupSymbol(symbol) == nil
 }
diff --git a/pkg/nvlib/device/mig_device.go b/pkg/nvlib/device/mig_device.go
@@ -19,7 +19,7 @@ package device
 import (
 	"fmt"
 
-	"github.com/NVIDIA/go-nvlib/pkg/nvml"
+	"github.com/NVIDIA/go-nvml/pkg/nvml"
 )
 
 // MigDevice defines the set of extended functions associated with a MIG device.

diff --git a/pkg/nvlib/device/mig_profile.go b/pkg/nvlib/device/mig_profile.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/NVIDIA/go-nvlib/pkg/nvml"
+	"github.com/NVIDIA/go-nvml/pkg/nvml"
 )
 
 const (

diff --git a/pkg/nvlib/device/mig_profile_test.go b/pkg/nvlib/device/mig_profile_test.go
@@ -22,15 +22,16 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/NVIDIA/go-nvlib/pkg/nvml"
+	"github.com/NVIDIA/go-nvml/pkg/nvml"
+	"github.com/NVIDIA/go-nvml/pkg/nvml/mock"
 )
 
 type MigProfileInfoWrapper struct {
 	MigProfileInfo
 }
 
 func newMockDeviceLib() Interface {
-	mockDevice := &nvml.DeviceMock{
+	mockDevice := &mock.Device{
 		GetNameFunc: func() (string, nvml.Return) {
 			return "MockDevice", nvml.SUCCESS
 		},
@@ -69,7 +70,7 @@ func newMockDeviceLib() Interface {
 			return info, nvml.SUCCESS
 		},
 	}
-	mockNvml := &nvml.InterfaceMock{
+	mockNvml := &mock.Interface{
 		DeviceGetCountFunc: func() (int, nvml.Return) {
 			return 1, nvml.SUCCESS
 		},

diff --git a/pkg/nvml/ci.go b/pkg/nvml/ci.go
diff --git a/pkg/nvml/consts.go b/pkg/nvml/consts.go