JointCloud
/
JCC-CSScheduler
mirror of https://gitlink.org.cn/cloudream/scheduler.git
24
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

包名调整

This commit is contained in:
Sydonian 2024-04-11 17:15:58 +08:00
parent 018900c853
commit 49a80a693c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
advisor/internal/scheduler/scheduler.go
View File

@ -10,7 +10,7 @@ import (
schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
uopsdk "gitlink.org.cn/cloudream/common/sdks/unifyops" uopsdk "gitlink.org.cn/cloudream/common/sdks/unifyops"
"gitlink.org.cn/cloudream/common/utils/math" "gitlink.org.cn/cloudream/common/utils/math2"
schglb "gitlink.org.cn/cloudream/scheduler/common/globals" schglb "gitlink.org.cn/cloudream/scheduler/common/globals"
schmod "gitlink.org.cn/cloudream/scheduler/common/models" schmod "gitlink.org.cn/cloudream/scheduler/common/models"
@ -247,7 +247,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo
resDetail.CPU.Score = (float64(res.Available.Value) / requires.CPU) * CpuResourceWeight resDetail.CPU.Score = (float64(res.Available.Value) / requires.CPU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.CPU.Level) maxLevel = math2.Max(maxLevel, resDetail.CPU.Level)
totalScore += resDetail.CPU.Score totalScore += resDetail.CPU.Score
resKinds++ resKinds++
} }
@ -262,7 +262,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo
resDetail.GPU.Score = (float64(res.Available.Value) / requires.GPU) * CpuResourceWeight resDetail.GPU.Score = (float64(res.Available.Value) / requires.GPU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.GPU.Level) maxLevel = math2.Max(maxLevel, resDetail.GPU.Level)
totalScore += resDetail.GPU.Score totalScore += resDetail.GPU.Score
resKinds++ resKinds++
} }
@ -277,7 +277,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo
resDetail.NPU.Score = (float64(res.Available.Value) / requires.NPU) * CpuResourceWeight resDetail.NPU.Score = (float64(res.Available.Value) / requires.NPU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.NPU.Level) maxLevel = math2.Max(maxLevel, resDetail.NPU.Level)
totalScore += resDetail.NPU.Score totalScore += resDetail.NPU.Score
resKinds++ resKinds++
} }
@ -292,7 +292,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo
resDetail.MLU.Score = (float64(res.Available.Value) / requires.MLU) * CpuResourceWeight resDetail.MLU.Score = (float64(res.Available.Value) / requires.MLU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.MLU.Level) maxLevel = math2.Max(maxLevel, resDetail.MLU.Level)
totalScore += resDetail.MLU.Score totalScore += resDetail.MLU.Score
resKinds++ resKinds++
} }
@ -312,7 +312,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo
resDetail.Storage.Score = (float64(bytes) / float64(requires.Storage)) * StgResourceWeight resDetail.Storage.Score = (float64(bytes) / float64(requires.Storage)) * StgResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.Storage.Level) maxLevel = math2.Max(maxLevel, resDetail.Storage.Level)
totalScore += resDetail.Storage.Score totalScore += resDetail.Storage.Score
resKinds++ resKinds++
} }
@ -332,7 +332,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo
resDetail.Memory.Score = (float64(bytes) / float64(requires.Memory)) * StgResourceWeight resDetail.Memory.Score = (float64(bytes) / float64(requires.Memory)) * StgResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.Memory.Level) maxLevel = math2.Max(maxLevel, resDetail.Memory.Level)
totalScore += resDetail.Memory.Score totalScore += resDetail.Memory.Score
resKinds++ resKinds++
} }

14
client/internal/prescheduler/default_prescheduler.go
View File

@ -10,7 +10,7 @@ import (
schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
uopsdk "gitlink.org.cn/cloudream/common/sdks/unifyops" uopsdk "gitlink.org.cn/cloudream/common/sdks/unifyops"
"gitlink.org.cn/cloudream/common/utils/math" "gitlink.org.cn/cloudream/common/utils/math2"
schglb "gitlink.org.cn/cloudream/scheduler/common/globals" schglb "gitlink.org.cn/cloudream/scheduler/common/globals"
schmod "gitlink.org.cn/cloudream/scheduler/common/models" schmod "gitlink.org.cn/cloudream/scheduler/common/models"
@ -419,7 +419,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI
resDetail.CPU.Score = (float64(res.Available.Value) / requires.CPU) * CpuResourceWeight resDetail.CPU.Score = (float64(res.Available.Value) / requires.CPU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.CPU.Level) maxLevel = math2.Max(maxLevel, resDetail.CPU.Level)
totalScore += resDetail.CPU.Score totalScore += resDetail.CPU.Score
resKinds++ resKinds++
} }
@ -434,7 +434,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI
resDetail.GPU.Score = (float64(res.Available.Value) / requires.GPU) * CpuResourceWeight resDetail.GPU.Score = (float64(res.Available.Value) / requires.GPU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.GPU.Level) maxLevel = math2.Max(maxLevel, resDetail.GPU.Level)
totalScore += resDetail.GPU.Score totalScore += resDetail.GPU.Score
resKinds++ resKinds++
} }
@ -449,7 +449,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI
resDetail.NPU.Score = (float64(res.Available.Value) / requires.NPU) * CpuResourceWeight resDetail.NPU.Score = (float64(res.Available.Value) / requires.NPU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.NPU.Level) maxLevel = math2.Max(maxLevel, resDetail.NPU.Level)
totalScore += resDetail.NPU.Score totalScore += resDetail.NPU.Score
resKinds++ resKinds++
} }
@ -464,7 +464,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI
resDetail.MLU.Score = (float64(res.Available.Value) / requires.MLU) * CpuResourceWeight resDetail.MLU.Score = (float64(res.Available.Value) / requires.MLU) * CpuResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.MLU.Level) maxLevel = math2.Max(maxLevel, resDetail.MLU.Level)
totalScore += resDetail.MLU.Score totalScore += resDetail.MLU.Score
resKinds++ resKinds++
} }
@ -484,7 +484,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI
resDetail.Storage.Score = (float64(bytes) / float64(requires.Storage)) * StgResourceWeight resDetail.Storage.Score = (float64(bytes) / float64(requires.Storage)) * StgResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.Storage.Level) maxLevel = math2.Max(maxLevel, resDetail.Storage.Level)
totalScore += resDetail.Storage.Score totalScore += resDetail.Storage.Score
resKinds++ resKinds++
} }
@ -504,7 +504,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI
resDetail.Memory.Score = (float64(bytes) / float64(requires.Memory)) * StgResourceWeight resDetail.Memory.Score = (float64(bytes) / float64(requires.Memory)) * StgResourceWeight
} }
maxLevel = math.Max(maxLevel, resDetail.Memory.Level) maxLevel = math2.Max(maxLevel, resDetail.Memory.Level)
totalScore += resDetail.Memory.Score totalScore += resDetail.Memory.Score
resKinds++ resKinds++
} }