Skip to content

Add modeset device #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pradvenkat merged 2 commits into from
Jul 2, 2021
Merged

Add modeset device #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b680aa
add nvidia-modeset device if present
danisla Sep 19, 2019
53c0a7f
fix modeset device tests
farbodmg Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkg/gpu/nvidia/alpha_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,16 @@ func TestNvidiaGPUManagerAlphaAPI(t *testing.T) {
testNvidiaCtlDevice := path.Join(testDevDir, nvidiaCtlDevice)
testNvidiaUVMDevice := path.Join(testDevDir, nvidiaUVMDevice)
testNvidiaUVMToolsDevice := path.Join(testDevDir, nvidiaUVMToolsDevice)
testNvidiaModesetDevice := path.Join(testDevDir, nvidiaModesetDevice)
os.Create(testNvidiaCtlDevice)
os.Create(testNvidiaUVMDevice)
os.Create(testNvidiaUVMToolsDevice)
testGpuManager.defaultDevices = []string{testNvidiaCtlDevice, testNvidiaUVMDevice, testNvidiaUVMToolsDevice}
os.Create(testNvidiaModesetDevice)
testGpuManager.defaultDevices = []string{testNvidiaCtlDevice, testNvidiaUVMDevice, testNvidiaUVMToolsDevice, testNvidiaModesetDevice}
defer os.Remove(testNvidiaCtlDevice)
defer os.Remove(testNvidiaUVMDevice)
defer os.Remove(testNvidiaUVMToolsDevice)
defer os.Remove(testNvidiaModesetDevice)

gpu1 := path.Join(testDevDir, "nvidia1")
gpu2 := path.Join(testDevDir, "nvidia2")
Expand Down Expand Up @@ -164,7 +167,7 @@ func TestNvidiaGPUManagerAlphaAPI(t *testing.T) {
DevicesIDs: []string{"nvidia1"},
})
as.Nil(err)
as.Len(resp.Devices, 4)
as.Len(resp.Devices, 5)
as.Len(resp.Mounts, 2)
resp, err = client.Allocate(context.Background(), &pluginapi.AllocateRequest{
DevicesIDs: []string{"nvidia1", "nvidia2"},
Expand All @@ -179,6 +182,7 @@ func TestNvidiaGPUManagerAlphaAPI(t *testing.T) {
as.Contains(retDevices, testNvidiaCtlDevice)
as.Contains(retDevices, testNvidiaUVMDevice)
as.Contains(retDevices, testNvidiaUVMToolsDevice)
as.Contains(retDevices, testNvidiaModesetDevice)
resp, err = client.Allocate(context.Background(), &pluginapi.AllocateRequest{
DevicesIDs: []string{"nvidia1", "nvidia3"},
})
Expand Down
8 changes: 6 additions & 2 deletions pkg/gpu/nvidia/beta_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,16 @@ func TestNvidiaGPUManagerBetaAPI(t *testing.T) {
testNvidiaCtlDevice := path.Join(testDevDir, nvidiaCtlDevice)
testNvidiaUVMDevice := path.Join(testDevDir, nvidiaUVMDevice)
testNvidiaUVMToolsDevice := path.Join(testDevDir, nvidiaUVMToolsDevice)
testNvidiaModesetDevice := path.Join(testDevDir, nvidiaModesetDevice)
os.Create(testNvidiaCtlDevice)
os.Create(testNvidiaUVMDevice)
os.Create(testNvidiaUVMToolsDevice)
testGpuManager.defaultDevices = []string{testNvidiaCtlDevice, testNvidiaUVMDevice, testNvidiaUVMToolsDevice}
os.Create(testNvidiaModesetDevice)
testGpuManager.defaultDevices = []string{testNvidiaCtlDevice, testNvidiaUVMDevice, testNvidiaUVMToolsDevice, testNvidiaModesetDevice}
defer os.Remove(testNvidiaCtlDevice)
defer os.Remove(testNvidiaUVMDevice)
defer os.Remove(testNvidiaUVMToolsDevice)
defer os.Remove(testNvidiaModesetDevice)

gpu1 := path.Join(testDevDir, "nvidia1")
gpu2 := path.Join(testDevDir, "nvidia2")
Expand Down Expand Up @@ -108,7 +111,7 @@ func TestNvidiaGPUManagerBetaAPI(t *testing.T) {
{DevicesIDs: []string{"nvidia1"}}}})
as.Nil(err)
as.Len(resp.ContainerResponses, 1)
as.Len(resp.ContainerResponses[0].Devices, 4)
as.Len(resp.ContainerResponses[0].Devices, 5)
as.Len(resp.ContainerResponses[0].Mounts, 2)
resp, err = client.Allocate(context.Background(), &pluginapi.AllocateRequest{
ContainerRequests: []*pluginapi.ContainerAllocateRequest{
Expand All @@ -123,6 +126,7 @@ func TestNvidiaGPUManagerBetaAPI(t *testing.T) {
as.Contains(retDevices, testNvidiaCtlDevice)
as.Contains(retDevices, testNvidiaUVMDevice)
as.Contains(retDevices, testNvidiaUVMToolsDevice)
as.Contains(retDevices, testNvidiaModesetDevice)
resp, err = client.Allocate(context.Background(), &pluginapi.AllocateRequest{
ContainerRequests: []*pluginapi.ContainerAllocateRequest{
{DevicesIDs: []string{"nvidia1", "nvidia3"}}}})
Expand Down
12 changes: 10 additions & 2 deletions pkg/gpu/nvidia/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ const (
// If the driver installed correctly, these two devices will be there.
nvidiaCtlDevice = "nvidiactl"
nvidiaUVMDevice = "nvidia-uvm"
// Optional device.
nvidiaUVMToolsDevice = "nvidia-uvm-tools"

// Optional devices.
nvidiaUVMToolsDevice = "nvidia-uvm-tools"
nvidiaModesetDevice = "nvidia-modeset"

nvidiaDeviceRE = `^nvidia[0-9]*$`
gpuCheckInterval = 10 * time.Second
pluginSocketCheckInterval = 1 * time.Second
Expand Down Expand Up @@ -207,6 +210,11 @@ func (ngm *nvidiaGPUManager) Start() error {
}
ngm.defaultDevices = []string{ngm.nvidiaCtlDevicePath, ngm.nvidiaUVMDevicePath}

nvidiaModesetDevicePath := path.Join(ngm.devDirectory, nvidiaModesetDevice)
if _, err := os.Stat(nvidiaModesetDevicePath); err == nil {
ngm.defaultDevices = append(ngm.defaultDevices, nvidiaModesetDevicePath)
}

nvidiaUVMToolsDevicePath := path.Join(ngm.devDirectory, nvidiaUVMToolsDevice)
if _, err := os.Stat(nvidiaUVMToolsDevicePath); err == nil {
ngm.defaultDevices = append(ngm.defaultDevices, nvidiaUVMToolsDevicePath)
Expand Down
8 changes: 6 additions & 2 deletions pkg/gpu/nvidia/multiple_versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,16 @@ func TestNvidiaGPUManagerMultuipleAPIs(t *testing.T) {
testNvidiaCtlDevice := path.Join(testDevDir, nvidiaCtlDevice)
testNvidiaUVMDevice := path.Join(testDevDir, nvidiaUVMDevice)
testNvidiaUVMToolsDevice := path.Join(testDevDir, nvidiaUVMToolsDevice)
testNvidiaModesetDevice := path.Join(testDevDir, nvidiaModesetDevice)
os.Create(testNvidiaCtlDevice)
os.Create(testNvidiaUVMDevice)
os.Create(testNvidiaUVMToolsDevice)
testGpuManager.defaultDevices = []string{testNvidiaCtlDevice, testNvidiaUVMDevice, testNvidiaUVMToolsDevice}
os.Create(testNvidiaModesetDevice)
testGpuManager.defaultDevices = []string{testNvidiaCtlDevice, testNvidiaUVMDevice, testNvidiaUVMToolsDevice, testNvidiaModesetDevice}
defer os.Remove(testNvidiaCtlDevice)
defer os.Remove(testNvidiaUVMDevice)
defer os.Remove(testNvidiaUVMToolsDevice)
defer os.Remove(testNvidiaModesetDevice)

gpu1 := path.Join(testDevDir, "nvidia1")
gpu2 := path.Join(testDevDir, "nvidia2")
Expand Down Expand Up @@ -110,7 +113,7 @@ func TestNvidiaGPUManagerMultuipleAPIs(t *testing.T) {
{DevicesIDs: []string{"nvidia1"}}}})
as.Nil(err)
as.Len(resp.ContainerResponses, 1)
as.Len(resp.ContainerResponses[0].Devices, 4)
as.Len(resp.ContainerResponses[0].Devices, 5)
as.Len(resp.ContainerResponses[0].Mounts, 2)
resp, err = clientBeta.Allocate(context.Background(), &pluginbeta.AllocateRequest{
ContainerRequests: []*pluginbeta.ContainerAllocateRequest{
Expand All @@ -125,6 +128,7 @@ func TestNvidiaGPUManagerMultuipleAPIs(t *testing.T) {
as.Contains(retDevices, testNvidiaCtlDevice)
as.Contains(retDevices, testNvidiaUVMDevice)
as.Contains(retDevices, testNvidiaUVMToolsDevice)
as.Contains(retDevices, testNvidiaModesetDevice)
resp, err = clientBeta.Allocate(context.Background(), &pluginbeta.AllocateRequest{
ContainerRequests: []*pluginbeta.ContainerAllocateRequest{
{DevicesIDs: []string{"nvidia1", "nvidia3"}}}})
Expand Down