From 49a80a693c894c97569bd8c2ece42d2ca7bb445d Mon Sep 17 00:00:00 2001 From: Sydonian <794346190@qq.com> Date: Thu, 11 Apr 2024 17:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- advisor/internal/scheduler/scheduler.go | 14 +++++++------- .../internal/prescheduler/default_prescheduler.go | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/advisor/internal/scheduler/scheduler.go b/advisor/internal/scheduler/scheduler.go index 2215559..2678d92 100644 --- a/advisor/internal/scheduler/scheduler.go +++ b/advisor/internal/scheduler/scheduler.go @@ -10,7 +10,7 @@ import ( schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" 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 } - maxLevel = math.Max(maxLevel, resDetail.CPU.Level) + maxLevel = math2.Max(maxLevel, resDetail.CPU.Level) totalScore += resDetail.CPU.Score resKinds++ } @@ -262,7 +262,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo 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 resKinds++ } @@ -277,7 +277,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo 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 resKinds++ } @@ -292,7 +292,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo 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 resKinds++ } @@ -312,7 +312,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo 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 resKinds++ } @@ -332,7 +332,7 @@ func (s *DefaultScheduler) calcOneResourceScore(requires schsdk.JobResourcesInfo 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 resKinds++ } diff --git a/client/internal/prescheduler/default_prescheduler.go b/client/internal/prescheduler/default_prescheduler.go index d34e28c..8d73152 100644 --- a/client/internal/prescheduler/default_prescheduler.go +++ b/client/internal/prescheduler/default_prescheduler.go @@ -10,7 +10,7 @@ import ( schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" 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 } - maxLevel = math.Max(maxLevel, resDetail.CPU.Level) + maxLevel = math2.Max(maxLevel, resDetail.CPU.Level) totalScore += resDetail.CPU.Score resKinds++ } @@ -434,7 +434,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI 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 resKinds++ } @@ -449,7 +449,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI 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 resKinds++ } @@ -464,7 +464,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI 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 resKinds++ } @@ -484,7 +484,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI 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 resKinds++ } @@ -504,7 +504,7 @@ func (s *DefaultPreScheduler) calcOneResourceScore(requires schsdk.JobResourcesI 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 resKinds++ }