Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pkg/device/cambricon/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ const (
MluMemSplitEnable = "CAMBRICON_SPLIT_ENABLE"
MLUInUse = "cambricon.com/use-mlutype"
MLUNoUse = "cambricon.com/nouse-mlutype"
// MLUUseUUID is user can use specify MLU device for set MLU UUID.
// MLUUseUUID annotation specifies a comma-separated list of MLU UUIDs to use.
MLUUseUUID = "cambricon.com/use-gpuuuid"
// MLUNoUseUUID is user can not use specify MLU device for set MLU UUID.
// MLUNoUseUUID annotation specifies a comma-separated list of MLU UUIDs to exclude.
MLUNoUseUUID = "cambricon.com/nouse-gpuuuid"
DsmluLockTime = "cambricon.com/dsmlu.lock"
DsmluProfile = "CAMBRICON_DSMLU_PROFILE"
Expand Down
25 changes: 9 additions & 16 deletions pkg/device/enflame/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package enflame

import (
"fmt"
"slices"
"strconv"
"strings"
"time"
Expand All @@ -37,9 +38,9 @@ type EnflameDevices struct {
const (
EnflameVGCUDevice = "Enflame"
EnflameVGCUCommonWord = "Enflame"
// IluvatarUseUUID is user can use specify Iluvatar device for set Iluvatar UUID.
// EnflameUseUUID annotation specifies a comma-separated list of Enflame UUIDs to use.
EnflameUseUUID = "enflame.com/use-gpuuuid"
// IluvatarNoUseUUID is user can not use specify Iluvatar device for set Iluvatar UUID.
// EnflameNoUseUUID annotation specifies a comma-separated list of Enflame UUIDs to exclude.
EnflameNoUseUUID = "enflame.com/nouse-gpuuuid"
PodRequestGCUSize = "enflame.com/gcu-request-size"
PodAssignedGCUID = "enflame.com/gcu-assigned-id"
Expand Down Expand Up @@ -164,26 +165,18 @@ func (dev *EnflameDevices) checkType(annos map[string]string, d device.DeviceUsa
func (dev *EnflameDevices) checkUUID(annos map[string]string, d device.DeviceUsage) bool {
userUUID, ok := annos[EnflameUseUUID]
if ok {
klog.V(5).Infof("check uuid for Iluvatar user uuid [%s], device id is %s", userUUID, d.ID)
klog.V(5).Infof("check uuid for Enflame user uuid [%s], device id is %s", userUUID, d.ID)
// use , symbol to connect multiple uuid
for uuid := range strings.SplitSeq(userUUID, ",") {
if d.ID == uuid {
return true
}
}
return false
userUUIDs := strings.Split(userUUID, ",")
return slices.Contains(userUUIDs, d.ID)
}

noUserUUID, ok := annos[EnflameNoUseUUID]
if ok {
klog.V(5).Infof("check uuid for Iluvatar not user uuid [%s], device id is %s", noUserUUID, d.ID)
klog.V(5).Infof("check uuid for Enflame not user uuid [%s], device id is %s", noUserUUID, d.ID)
// use , symbol to connect multiple uuid
for uuid := range strings.SplitSeq(noUserUUID, ",") {
if d.ID == uuid {
return false
}
}
return true
noUserUUIDs := strings.Split(noUserUUID, ",")
return !slices.Contains(noUserUUIDs, d.ID)
}
return true
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/device/hygon/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ const (
HygonDCUCommonWord = "DCU"
DCUInUse = "hygon.com/use-dcutype"
DCUNoUse = "hygon.com/nouse-dcutype"
// DCUUseUUID is user can use specify DCU device for set DCU UUID.
// DCUUseUUID annotation specifies a comma-separated list of DCU UUIDs to use.
DCUUseUUID = "hygon.com/use-gpuuuid"
// DCUNoUseUUID is user can not use specify DCU device for set DCU UUID.
// DCUNoUseUUID annotation specifies a comma-separated list of DCU UUIDs to exclude.
DCUNoUseUUID = "hygon.com/nouse-gpuuuid"

// NodeLockDCU should same with device plugin node lock name
Expand Down
6 changes: 3 additions & 3 deletions pkg/device/mthreads/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ const (
MthreadsGPUDevice = "Mthreads"
MthreadsGPUCommonWord = "Mthreads"
MthreadsDeviceSelection = "mthreads.com/gpu-index"
// MthreadsUseUUID is user can use specify Mthreads device for set Mthreads UUID.
// MthreadsUseUUID annotation specifies a comma-separated list of Mthreads UUIDs to use.
MthreadsUseUUID = "mthreads.ai/use-gpuuuid"
// MthreadsNoUseUUID is user can not use specify Mthreads device for set Mthreads UUID.
// MthreadsNoUseUUID annotation specifies a comma-separated list of Mthreads UUIDs to exclude.
MthreadsNoUseUUID = "mthreads.ai/nouse-gpuuuid"
MthreadsAssignedGPUIndex = "mthreads.com/gpu-index"
MthreadsAssignedNode = "mthreads.com/predicate-node"
Expand Down Expand Up @@ -190,7 +190,7 @@ func (dev *MthreadsDevices) checkUUID(annos map[string]string, d device.DeviceUs

noUserUUID, ok := annos[MthreadsNoUseUUID]
if ok {
klog.V(5).Infof("check uuid for Iluvatar not user uuid [%s], device id is %s", noUserUUID, d.ID)
klog.V(5).Infof("check uuid for Mthreads not user uuid [%s], device id is %s", noUserUUID, d.ID)
// use , symbol to connect multiple uuid
noUserUUIDs := strings.Split(noUserUUID, ",")
return !slices.Contains(noUserUUIDs, d.ID)
Expand Down
4 changes: 2 additions & 2 deletions pkg/device/nvidia/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ const (
GPUNoUse = "nvidia.com/nouse-gputype"
NumaBind = "nvidia.com/numa-bind"
NodeLockNvidia = "hami.io/mutex.lock"
// GPUUseUUID is user can use specify GPU device for set GPU UUID.
// GPUUseUUID annotation specifies a comma-separated list of GPU UUIDs to use.
GPUUseUUID = "nvidia.com/use-gpuuuid"
// GPUNoUseUUID is user can not use specify GPU device for set GPU UUID.
// GPUNoUseUUID annotation specifies a comma-separated list of GPU UUIDs to exclude.
GPUNoUseUUID = "nvidia.com/nouse-gpuuuid"
AllocateMode = "nvidia.com/vgpu-mode"

Expand Down
Loading