UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 00:08:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace go-nvlib/pkg/nvml with go-nvml/pkg/nvml

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2024-04-18 15:01:20 +02:00
parent 2019cd6f0a
commit b6be911eaa
12 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/info/additional_info.go
View File

@ -22,7 +22,7 @@ import (
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/info" "github.com/NVIDIA/go-nvlib/pkg/nvlib/info"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
) )
// additionalInfo allows for the info.Interface to be extened to implement the infoInterface. // additionalInfo allows for the info.Interface to be extened to implement the infoInterface.

37
internal/info/additional_info_test.go
View File

@ -20,7 +20,8 @@ import (
"testing" "testing"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"github.com/NVIDIA/go-nvml/pkg/nvml/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -32,7 +33,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}{ }{
{ {
description: "init failure returns false", description: "init failure returns false",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.ERROR_LIBRARY_NOT_FOUND return nvml.ERROR_LIBRARY_NOT_FOUND
}, },
@ -41,7 +42,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "no devices returns false", description: "no devices returns false",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -56,7 +57,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "DeviceGetCount error returns false", description: "DeviceGetCount error returns false",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -71,7 +72,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "Failure to get device name returns false", description: "Failure to get device name returns false",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -82,7 +83,7 @@ func TestUsesNVGPUModule(t *testing.T) {
return 1, nvml.SUCCESS return 1, nvml.SUCCESS
}, },
DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) { DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) {
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
return "", nvml.ERROR_UNKNOWN return "", nvml.ERROR_UNKNOWN
}, },
@ -94,7 +95,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "nested panic returns false", description: "nested panic returns false",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -105,7 +106,7 @@ func TestUsesNVGPUModule(t *testing.T) {
return 1, nvml.SUCCESS return 1, nvml.SUCCESS
}, },
DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) { DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) {
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
panic("deep panic") panic("deep panic")
}, },
@ -117,7 +118,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "Single device name with no nvgpu", description: "Single device name with no nvgpu",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -128,7 +129,7 @@ func TestUsesNVGPUModule(t *testing.T) {
return 1, nvml.SUCCESS return 1, nvml.SUCCESS
}, },
DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) { DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) {
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
return "NVIDIA A100-SXM4-40GB", nvml.SUCCESS return "NVIDIA A100-SXM4-40GB", nvml.SUCCESS
}, },
@ -140,7 +141,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "Single device name with nvgpu", description: "Single device name with nvgpu",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -151,7 +152,7 @@ func TestUsesNVGPUModule(t *testing.T) {
return 1, nvml.SUCCESS return 1, nvml.SUCCESS
}, },
DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) { DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) {
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
return "Orin (nvgpu)", nvml.SUCCESS return "Orin (nvgpu)", nvml.SUCCESS
}, },
@ -163,7 +164,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "Multiple device names with no nvgpu", description: "Multiple device names with no nvgpu",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -174,7 +175,7 @@ func TestUsesNVGPUModule(t *testing.T) {
return 2, nvml.SUCCESS return 2, nvml.SUCCESS
}, },
DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) { DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) {
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
return "NVIDIA A100-SXM4-40GB", nvml.SUCCESS return "NVIDIA A100-SXM4-40GB", nvml.SUCCESS
}, },
@ -186,7 +187,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "Multiple device names with nvgpu", description: "Multiple device names with nvgpu",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -197,7 +198,7 @@ func TestUsesNVGPUModule(t *testing.T) {
return 2, nvml.SUCCESS return 2, nvml.SUCCESS
}, },
DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) { DeviceGetHandleByIndexFunc: func(index int) (nvml.Device, nvml.Return) {
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
return "Orin (nvgpu)", nvml.SUCCESS return "Orin (nvgpu)", nvml.SUCCESS
}, },
@ -209,7 +210,7 @@ func TestUsesNVGPUModule(t *testing.T) {
}, },
{ {
description: "Mixed device names", description: "Mixed device names",
nvmllib: &nvml.InterfaceMock{ nvmllib: &mock.Interface{
InitFunc: func() nvml.Return { InitFunc: func() nvml.Return {
return nvml.SUCCESS return nvml.SUCCESS
}, },
@ -226,7 +227,7 @@ func TestUsesNVGPUModule(t *testing.T) {
} else { } else {
deviceName = "Orin (nvgpu)" deviceName = "Orin (nvgpu)"
} }
device := &nvml.DeviceMock{ device := &mock.Device{
GetNameFunc: func() (string, nvml.Return) { GetNameFunc: func() (string, nvml.Return) {
return deviceName, nvml.SUCCESS return deviceName, nvml.SUCCESS
}, },

2
internal/info/auto.go
View File

@ -19,7 +19,7 @@ package info
import ( import (
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/info" "github.com/NVIDIA/go-nvlib/pkg/nvlib/info"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"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"

2
pkg/nvcdi/driver-nvml.go
View File

@ -22,7 +22,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover"

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

@ -23,7 +23,7 @@ import (
"strings" "strings"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"

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

@ -22,7 +22,7 @@ import (
"strings" "strings"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"

2
pkg/nvcdi/lib.go
View File

@ -21,7 +21,7 @@ import (
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/info" "github.com/NVIDIA/go-nvlib/pkg/nvlib/info"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"

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

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/cdi"
"tags.cncf.io/container-device-interface/specs-go" "tags.cncf.io/container-device-interface/specs-go"

2
pkg/nvcdi/namer.go
View File

@ -20,7 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
) )
// UUIDer is an interface for getting UUIDs. // UUIDer is an interface for getting UUIDs.

2
pkg/nvcdi/namer_nvml_mock.go
View File

@ -6,7 +6,7 @@ package nvcdi
import ( import (
"sync" "sync"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
) )
// Ensure, that nvmlUUIDerMock does implement nvmlUUIDer. // Ensure, that nvmlUUIDerMock does implement nvmlUUIDer.

2
pkg/nvcdi/namer_test.go
View File

@ -19,7 +19,7 @@ package nvcdi
import ( import (
"testing" "testing"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
pkg/nvcdi/options.go
View File

@ -18,7 +18,7 @@ package nvcdi
import ( import (
"github.com/NVIDIA/go-nvlib/pkg/nvlib/device" "github.com/NVIDIA/go-nvlib/pkg/nvlib/device"
"github.com/NVIDIA/go-nvlib/pkg/nvml" "github.com/NVIDIA/go-nvml/pkg/nvml"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"