fix: sort node by device minor id (#137)

fix: use AllocatableMemory instead of used
Signed-off-by: thomassong <thomassong2012@gmail.com>

Author: mYmNeo

pkg/algorithm/nvidia/fragment.go

@@ -44,7 +44,7 @@ func (al *fragmentMode) Evaluate(cores int64, _ int64) []*nvidia.NvidiaNode {
 	var (
 		candidate = al.tree.Root()
 		next      *nvidia.NvidiaNode
-		sorter    = fragmentSort(nvidia.ByAvailable, nvidia.ByMemory, nvidia.ByPids, nvidia.ByID)
+		sorter    = fragmentSort(nvidia.ByAvailable, nvidia.ByAllocatableMemory, nvidia.ByPids, nvidia.ByMinorID)
 		nodes     = make([]*nvidia.NvidiaNode, 0)
 		num       = int(cores / nvidia.HundredCore)
 	)

pkg/algorithm/nvidia/link.go

@@ -39,7 +39,7 @@ func NewLinkMode(t *nvidia.NvidiaTree) *linkMode {
 
 func (al *linkMode) Evaluate(cores int64, memory int64) []*nvidia.NvidiaNode {
 	var (
-		sorter   = linkSort(nvidia.ByType, nvidia.ByAvailable, nvidia.ByMemory, nvidia.ByPids, nvidia.ByID)
+		sorter   = linkSort(nvidia.ByType, nvidia.ByAvailable, nvidia.ByAllocatableMemory, nvidia.ByPids, nvidia.ByMinorID)
 		tmpStore = make(map[int]*nvidia.NvidiaNode)
 		root     = al.tree.Root()
 		nodes    = make([]*nvidia.NvidiaNode, 0)

pkg/algorithm/nvidia/share.go

@@ -44,7 +44,7 @@ func (al *shareMode) Evaluate(cores int64, memory int64) []*nvidia.NvidiaNode {
 	var (
 		nodes    []*nvidia.NvidiaNode
 		tmpStore = make([]*nvidia.NvidiaNode, al.tree.Total())
-		sorter   = shareModeSort(nvidia.ByAllocatableCores, nvidia.ByAllocatableMemory, nvidia.ByPids, nvidia.ByID)
+		sorter   = shareModeSort(nvidia.ByAllocatableCores, nvidia.ByAllocatableMemory, nvidia.ByPids, nvidia.ByMinorID)
 	)
 
 	for i := 0; i < al.tree.Total(); i++ {

pkg/device/nvidia/sort.go

@@ -42,6 +42,11 @@ var (
 		return p1.Meta.ID < p2.Meta.ID
 	}
 
+	//ByMinorID compares two NvidiaNode by minor ID
+	ByMinorID = func(p1, p2 *NvidiaNode) bool {
+		return p1.Meta.MinorID < p2.Meta.MinorID
+	}
+
 	//ByMemory compares two NvidiaNode by memory already used
 	ByMemory = func(p1, p2 *NvidiaNode) bool {
 		return p1.Meta.UsedMemory < p2.Meta.UsedMemory
@@ -64,7 +69,7 @@ var (
 
 	//PrintSorter is used to sort nodes when printing them out
 	PrintSorter = &printSort{
-		less: []LessFunc{ByType, ByAvailable, ByID},
+		less: []LessFunc{ByType, ByAvailable, ByMinorID},
 	}
 )
 

pkg/device/nvidia/sort_test.go

@@ -58,7 +58,7 @@ GPU5     SOC     SOC     SOC     SOC     PIX      X
 			ByAvailable,
 			ByType,
 			ByAllocatableMemory,
-			ByID,
+			ByMinorID,
 			ByPids,
 			ByMemory},
 	}