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
24 changes: 0 additions & 24 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
github.com/NVIDIA/go-gpuallocator v0.6.0 h1:2PA2swx59gJYREPkZNTGtyCP6Pnz3WEgnYsXlRkyvkk=
github.com/NVIDIA/go-gpuallocator v0.6.0/go.mod h1:c+Yspg+/QxWOmoSQeuI48Z/7nS+mMPtxyj1NYUTwewY=
github.com/NVIDIA/go-nvlib v0.10.0 h1:2jbAFmvLBntIc/4iUChI9DzxyYNI92pohXU4kFuNrg0=
github.com/NVIDIA/go-nvlib v0.10.0/go.mod h1:7mzx9FSdO9fXWP9NKuZmWkCwhkEcSWQFe2tmFwtLb9c=
github.com/NVIDIA/go-nvlib v0.11.0 h1:J6c9deWGJ1x4yY7fKg+aOdm2v5+WmCIeCLsuaO3tRtA=
github.com/NVIDIA/go-nvlib v0.11.0/go.mod h1:uQNH63NoDuSfn/1lixD1D1Hvhko/xdnBHmc4H1mFUlY=
github.com/NVIDIA/go-nvml v0.13.3-0 h1:oJZ4+VTtPI/XT7XCfo5NvE9XTNrH8I3/KHy89rHxDxY=
github.com/NVIDIA/go-nvml v0.13.3-0/go.mod h1:ahi2psRYoa+wYUBIrZPRO+wJs9lcvMhxSSkjjvsJJNQ=
github.com/NVIDIA/go-nvml v0.13.3-1 h1:P76U2h88OZSiMtdhRsJjSF5DXyXUqHIXKeDicVAaae0=
github.com/NVIDIA/go-nvml v0.13.3-1/go.mod h1:ahi2psRYoa+wYUBIrZPRO+wJs9lcvMhxSSkjjvsJJNQ=
github.com/NVIDIA/k8s-device-plugin v0.19.3 h1:NE1ecj9oG/4MQfySHlPVW9EHtq7FqtL06vtydkdnX8E=
Expand Down Expand Up @@ -202,52 +198,32 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57 h1:nwGZBCt+FnXUrGsj5vjzAsEmkcaFvd82BbOjECiFYZc=
golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57/go.mod h1:3AWMyWHS+caVoiEXpiq6+tzKA40J4vQT3MYr80ZtQpc=
golang.org/x/telemetry v0.0.0-20260708182218-49f421fb7959 h1:RJhm5l6Fo4rmEIcndxDllNhhf/fAx8qIm4t6A7vpm2A=
golang.org/x/telemetry v0.0.0-20260708182218-49f421fb7959/go.mod h1:LV7u5Oco+Z/g6XI7PqN+EUUUGGkEcmB1uj2ceI0fOVg=
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
google.golang.org/grpc v1.82.0 h1:vguDnZUPjE26w09A63VoxZPnvPjB5Riyc0mkXPFmAIU=
google.golang.org/grpc v1.82.0/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
Expand Down
32 changes: 32 additions & 0 deletions pkg/device/devices.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,38 @@ type DevicePairScore struct {
Scores map[string]int `json:"score,omitempty"`
}

func (d DeviceInfo) DeepCopy() DeviceInfo {
dup := d

if d.MIGTemplate != nil {
dup.MIGTemplate = make([]Geometry, len(d.MIGTemplate))
for i, g := range d.MIGTemplate {
dup.MIGTemplate[i] = slices.Clone(g)
}
}

if d.CustomInfo != nil {
dup.CustomInfo = maps.Clone(d.CustomInfo)
}

if d.DevicePairScore.Scores != nil {
dup.DevicePairScore.Scores = maps.Clone(d.DevicePairScore.Scores)
}

return dup
}

func DeepCopyDeviceInfos(devices []DeviceInfo) []DeviceInfo {
if devices == nil {
return nil
}
dup := make([]DeviceInfo, len(devices))
for i, dev := range devices {
dup[i] = dev.DeepCopy()
}
return dup
}

type NodeInfo struct {
ID string
Node *corev1.Node
Expand Down
26 changes: 20 additions & 6 deletions pkg/scheduler/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,32 @@ import (
)

type NodeUsage struct {
Node *corev1.Node
Devices policy.DeviceUsageList
Node *corev1.Node
NodeInfo *device.NodeInfo
Devices policy.DeviceUsageList
}

func (n *NodeUsage) DeepCopy() *NodeUsage {
if n == nil {
return nil
}
var nodeInfoCopy *device.NodeInfo
if n.NodeInfo != nil {
nodeInfoCopy = &device.NodeInfo{
ID: n.NodeInfo.ID,
Devices: make(map[string][]device.DeviceInfo, len(n.NodeInfo.Devices)),
}
if n.NodeInfo.Node != nil {
nodeInfoCopy.Node = n.NodeInfo.Node.DeepCopy()
}
for vendor, devices := range n.NodeInfo.Devices {
nodeInfoCopy.Devices[vendor] = device.DeepCopyDeviceInfos(devices)
}
Comment thread
spencercjh marked this conversation as resolved.
Resolved
}
return &NodeUsage{
Node: n.Node.DeepCopy(),
Devices: n.Devices.DeepCopy(),
Node: n.Node.DeepCopy(),
NodeInfo: nodeInfoCopy,
Devices: n.Devices.DeepCopy(),
}
}

Expand Down Expand Up @@ -119,8 +134,7 @@ func (m *nodeManager) ListNodes() (map[string]*device.NodeInfo, error) {
Devices: make(map[string][]device.DeviceInfo),
}
for k, v := range nodeInfo.Devices {
nodeInfoCopy.Devices[k] = make([]device.DeviceInfo, len(v))
copy(nodeInfoCopy.Devices[k], v)
nodeInfoCopy.Devices[k] = device.DeepCopyDeviceInfos(v)
}
nodesCopy[nodeID] = nodeInfoCopy
}
Expand Down
50 changes: 50 additions & 0 deletions pkg/scheduler/nodes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,38 @@ func TestNodeUsageDeepCopy(t *testing.T) {
Name: "test-node",
},
},
NodeInfo: &device.NodeInfo{
ID: "test-node",
Node: &corev1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "test-node-info",
},
},
Devices: map[string][]device.DeviceInfo{
"NVIDIA": {{
ID: "GPU-info-0",
Count: 10,
Devmem: 8192,
Devcore: 100,
Type: "NVIDIA-A100",
Mode: "mig",
MIGTemplate: []device.Geometry{
{
{Name: "1g.5gb", Core: 14, Memory: 5120, Count: 1},
},
},
CustomInfo: map[string]any{
"profile": "gold",
},
DevicePairScore: device.DevicePairScore{
ID: "GPU-info-0",
Scores: map[string]int{
"GPU-info-1": 42,
},
},
}},
},
},
Devices: policy.DeviceUsageList{
Policy: "binpack",
DeviceLists: []*policy.DeviceListsScore{
Expand Down Expand Up @@ -295,6 +327,24 @@ func TestNodeUsageDeepCopy(t *testing.T) {
assert.Equal(t, tt.original.Devices.DeviceLists[0].Score, originalScore)
assert.Equal(t, tt.original.Devices.DeviceLists[0].Device.ID, originalDeviceID)
}
if copy.NodeInfo != nil {
if copy.NodeInfo.Node != nil {
originalNodeInfoName := tt.original.NodeInfo.Node.Name
copy.NodeInfo.Node.Name = "mutated-node-info"
assert.Equal(t, tt.original.NodeInfo.Node.Name, originalNodeInfoName)
}
if len(copy.NodeInfo.Devices["NVIDIA"]) > 0 {
originalTemplateName := tt.original.NodeInfo.Devices["NVIDIA"][0].MIGTemplate[0][0].Name
originalCustomInfo := tt.original.NodeInfo.Devices["NVIDIA"][0].CustomInfo["profile"]
originalPairScore := tt.original.NodeInfo.Devices["NVIDIA"][0].DevicePairScore.Scores["GPU-info-1"]
copy.NodeInfo.Devices["NVIDIA"][0].MIGTemplate[0][0].Name = "mutated-template"
copy.NodeInfo.Devices["NVIDIA"][0].CustomInfo["profile"] = "silver"
copy.NodeInfo.Devices["NVIDIA"][0].DevicePairScore.Scores["GPU-info-1"] = 7
assert.Equal(t, tt.original.NodeInfo.Devices["NVIDIA"][0].MIGTemplate[0][0].Name, originalTemplateName)
assert.Equal(t, tt.original.NodeInfo.Devices["NVIDIA"][0].CustomInfo["profile"], originalCustomInfo)
assert.Equal(t, tt.original.NodeInfo.Devices["NVIDIA"][0].DevicePairScore.Scores["GPU-info-1"], originalPairScore)
}
}
})
}
}
Expand Down
Loading
Loading