Merge branch 'switch-go-nvlib' into 'main'

Migrate to github.com/NVIDIA/go-nvlib See merge request nvidia/cloud-native/mig-parted!146
NVIDIA · Nov 20, 2023 · 54ed933 · 54ed933
2 parents f3175a8 + fca6404
commit 54ed933
Show file tree

Hide file tree

Showing 50 changed files with 3,365 additions and 854 deletions.
diff --git a/cmd/nvidia-mig-parted/util/device.go b/cmd/nvidia-mig-parted/util/device.go
@@ -24,7 +24,7 @@ import (
 	"github.com/NVIDIA/mig-parted/internal/nvml"
 	"github.com/NVIDIA/mig-parted/pkg/types"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci"
+	"github.com/NVIDIA/go-nvlib/pkg/nvpci"
 )
 
 func GetGPUDeviceIDs() ([]types.DeviceID, error) {

diff --git a/go.mod b/go.mod
@@ -3,12 +3,12 @@ module github.com/NVIDIA/mig-parted
 go 1.20
 
 require (
-	github.com/NVIDIA/go-nvml v0.12.0-1
+	github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d
+	github.com/NVIDIA/go-nvml v0.12.0-1.0.20231020145430-e06766c5e74f
 	github.com/google/uuid v1.1.2
 	github.com/sirupsen/logrus v1.7.0
 	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli/v2 v2.3.0
-	gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230327171225-18ad7cd513cf
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.21.0
 	k8s.io/apimachinery v0.21.0

diff --git a/go.sum b/go.sum
@@ -30,8 +30,10 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/NVIDIA/go-nvml v0.12.0-1 h1:6mdjtlFo+17dWL7VFPfuRMtf0061TF4DKls9pkSw6uM=
-github.com/NVIDIA/go-nvml v0.12.0-1/go.mod h1:hy7HYeQy335x6nEss0Ne3PYqleRa6Ct+VKD9RQ4nyFs=
+github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d h1:XxRHS7eNkZVcPpZZmUcoT4oO8FEcoYKn06sooQh5niU=
+github.com/NVIDIA/go-nvlib v0.0.0-20231116150931-9fd385bace0d/go.mod h1:HPFNPAYqQeoos58MKUboWsdZMu71EzSQrbmd+QBRD40=
+github.com/NVIDIA/go-nvml v0.12.0-1.0.20231020145430-e06766c5e74f h1:FTblgO87K1vPB8tcwM5EOFpFf6UpsrlDpErPm25mFWE=
+github.com/NVIDIA/go-nvml v0.12.0-1.0.20231020145430-e06766c5e74f/go.mod h1:7ruy85eOM73muOc/I37euONSwEyFqZsv5ED9AogD4G0=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
@@ -179,18 +181,20 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230327171225-18ad7cd513cf h1:mq26GXnc6zbsM7DD6Wmv0aQdcfXaRfQxLMmRj5G7ITY=
-gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230327171225-18ad7cd513cf/go.mod h1:KYZksBgh18o+uzgnpDazzG4LVYtnfB96VXHMXypEtik=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

diff --git a/pkg/mig/mode/pci.go b/pkg/mig/mode/pci.go
@@ -22,8 +22,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci"
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci/mmio"
+	"github.com/NVIDIA/go-nvlib/pkg/nvpci"
+	"github.com/NVIDIA/go-nvlib/pkg/nvpci/mmio"
 )
 
 const (

diff --git a/pkg/mig/mode/pci_test.go b/pkg/mig/mode/pci_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvpci"
+	"github.com/NVIDIA/go-nvlib/pkg/nvpci"
 )
 
 type mockPciMigModeManager struct {

diff --git a/pkg/types/mig_profile.go b/pkg/types/mig_profile.go
@@ -17,7 +17,7 @@
 package types
 
 import (
-	nvdev "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
+	nvdev "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
 )
 
 const (

diff --git a/pkg/types/nvdev.go b/pkg/types/nvdev.go
@@ -21,8 +21,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	nvdev "gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvlib/device"
-	"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
+	nvdev "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
+	"github.com/NVIDIA/go-nvlib/pkg/nvml"
 )
 
 var nvmllib nvml.Interface

diff --git a/....com/nvidia/cloud-native/go-nvlib/LICENSE → vendor/github.com/NVIDIA/go-nvlib/LICENSE b/....com/nvidia/cloud-native/go-nvlib/LICENSE → vendor/github.com/NVIDIA/go-nvlib/LICENSE
diff --git a/...b.com/nvidia/cloud-native/go-nvlib/NOTICE → vendor/github.com/NVIDIA/go-nvlib/NOTICE b/...b.com/nvidia/cloud-native/go-nvlib/NOTICE → vendor/github.com/NVIDIA/go-nvlib/NOTICE
diff --git a/...d-native/go-nvlib/pkg/nvlib/device/api.go → ...m/NVIDIA/go-nvlib/pkg/nvlib/device/api.go b/...d-native/go-nvlib/pkg/nvlib/device/api.go → ...m/NVIDIA/go-nvlib/pkg/nvlib/device/api.go
diff --git a/...ative/go-nvlib/pkg/nvlib/device/device.go → ...VIDIA/go-nvlib/pkg/nvlib/device/device.go b/...ative/go-nvlib/pkg/nvlib/device/device.go → ...VIDIA/go-nvlib/pkg/nvlib/device/device.go
diff --git a/...e/go-nvlib/pkg/nvlib/device/mig_device.go → ...A/go-nvlib/pkg/nvlib/device/mig_device.go b/...e/go-nvlib/pkg/nvlib/device/mig_device.go → ...A/go-nvlib/pkg/nvlib/device/mig_device.go
diff --git a/.../go-nvlib/pkg/nvlib/device/mig_profile.go → .../go-nvlib/pkg/nvlib/device/mig_profile.go b/.../go-nvlib/pkg/nvlib/device/mig_profile.go → .../go-nvlib/pkg/nvlib/device/mig_profile.go
diff --git a/...idia/cloud-native/go-nvlib/pkg/nvml/ci.go → ...github.com/NVIDIA/go-nvlib/pkg/nvml/ci.go b/...idia/cloud-native/go-nvlib/pkg/nvml/ci.go → ...github.com/NVIDIA/go-nvlib/pkg/nvml/ci.go
diff --git a/...cloud-native/go-nvlib/pkg/nvml/ci_mock.go → ...b.com/NVIDIA/go-nvlib/pkg/nvml/ci_mock.go b/...cloud-native/go-nvlib/pkg/nvml/ci_mock.go → ...b.com/NVIDIA/go-nvlib/pkg/nvml/ci_mock.go
diff --git a/.../cloud-native/go-nvlib/pkg/nvml/consts.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvml/consts.go b/.../cloud-native/go-nvlib/pkg/nvml/consts.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvml/consts.go
diff --git a/.../cloud-native/go-nvlib/pkg/nvml/device.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvml/device.go b/.../cloud-native/go-nvlib/pkg/nvml/device.go → ...ub.com/NVIDIA/go-nvlib/pkg/nvml/device.go