Merge pull request #64 from archlitchi/master

Update vgpu part
volcano-sh · Apr 12, 2024 · 6a108e0 · 6a108e0
2 parents 15b3915 + 221f9ed
commit 6a108e0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
  tags:
  - v[0-9]+.[0-9]+.[0-9]+
  branches: [master]
- pull_request:
+ pull_request_target:
  branches: [master]
 
 jobs:

diff --git a/docker/amd64/Dockerfile.vgpu-ubuntu20.04 b/docker/amd64/Dockerfile.vgpu-ubuntu20.04
@@ -39,6 +39,5 @@ ENV NVIDIA_DRIVER_CAPABILITIES=utility
 
 COPY --from=build /go/src/volcano.sh/devices/volcano-vgpu-device-plugin /usr/bin/volcano-vgpu-device-plugin
 RUN mkdir -p /k8s-vgpu/lib/nvidia
-COPY --from=build /go/src/volcano.sh/devices/lib/* /k8s-vgpu/lib/nvidia/
 
 ENTRYPOINT ["volcano-vgpu-device-plugin"]
diff --git a/lib/ld.so.preload b/lib/ld.so.preload
diff --git a/lib/libvgpu.so b/lib/libvgpu.so
diff --git a/pkg/plugin/vgpu/plugin.go b/pkg/plugin/vgpu/plugin.go
@@ -26,7 +26,6 @@ import (
  "strings"
  "time"
 
- "k8s.io/apimachinery/pkg/util/uuid"
  "k8s.io/klog/v2"
  "volcano.sh/k8s-device-plugin/pkg/lock"
  "volcano.sh/k8s-device-plugin/pkg/plugin/vgpu/config"
@@ -310,7 +309,7 @@ func (m *NvidiaDevicePlugin) Allocate(ctx context.Context, reqs *pluginapi.Alloc
  }
 
  for idx := range reqs.ContainerRequests {
- currentCtr, devreq, err := util.GetNextDeviceRequest(util.NvidiaGPUDevice, *current)
+ _, devreq, err := util.GetNextDeviceRequest(util.NvidiaGPUDevice, *current)
  klog.Infoln("deviceAllocateFromAnnotation=", devreq)
  if err != nil {
  klog.Errorln("get device from annotation failed", err.Error())
@@ -342,29 +341,6 @@ func (m *NvidiaDevicePlugin) Allocate(ctx context.Context, reqs *pluginapi.Alloc
  response.Envs["NVIDIA_VISIBLE_DEVICES"] = dev.UUID
  }
  }
- response.Envs["CUDA_DEVICE_MEMORY_SHARED_CACHE"] = fmt.Sprintf("/tmp/vgpu/%v.cache", uuid.NewUUID())
-
- cacheFileHostDirectory := "/tmp/vgpu/containers/" + string(current.UID) + "_" + currentCtr.Name
- os.MkdirAll(cacheFileHostDirectory, 0777)
- os.Chmod(cacheFileHostDirectory, 0777)
- os.MkdirAll("/tmp/vgpulock", 0777)
- os.Chmod("/tmp/vgpulock", 0777)
- hostHookPath := os.Getenv("HOOK_PATH")
- response.Mounts = append(response.Mounts,
- &pluginapi.Mount{ContainerPath: "/usr/local/vgpu/libvgpu.so",
- HostPath: hostHookPath + "/libvgpu.so",
- ReadOnly: true},
- &pluginapi.Mount{ContainerPath: "/etc/ld.so.preload",
- HostPath: hostHookPath + "/ld.so.preload",
- ReadOnly: true},
- &pluginapi.Mount{ContainerPath: "/tmp/vgpu",
- HostPath: cacheFileHostDirectory,
- ReadOnly: false},
- &pluginapi.Mount{ContainerPath: "/tmp/vgpulock",
- HostPath: "/tmp/vgpulock",
- ReadOnly: false},
- )
- responses.ContainerResponses = append(responses.ContainerResponses, &response)
  }
  klog.Infoln("Allocate Response", responses.ContainerResponses)
  util.PodAllocationTrySuccess(nodename, current)