From 6c8dae6a780261b279e91e0e8fecd182843a75db Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Mon, 22 Jan 2024 23:15:01 +0800
Subject: [PATCH] modified ai scheduler struct

Former-commit-id: 761d378c4d78dd20bc749e077c44a3b9ef772412
---
 pkg/scheduler/collector/acCollector.go |  7 +++++--
 pkg/scheduler/collector/collector.go   |  3 ++-
 pkg/scheduler/scheduler.go             | 15 +++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkg/scheduler/collector/acCollector.go b/pkg/scheduler/collector/acCollector.go
index fdeee694..8107a4c4 100644
--- a/pkg/scheduler/collector/acCollector.go
+++ b/pkg/scheduler/collector/acCollector.go
@@ -1,13 +1,16 @@
 package collector
 
+import "gitlink.org.cn/jcce-pcm/pcm-ac/hpcacclient"
+
 //单条作业费=作业运行秒数×(CPU核心数*CPU单价+GPU卡数×GPU单价+DCU卡数×DCU单价)/3600
 //CPU单价=队列CPU费率×计算中心CPU单价
 //GPU单价=队列GPU费率×计算中心GPU单价
 //DCU单价=队列DCU费率×计算中心DCU单价
 
 type ShuguangAiCollector struct {
+	ACRpc hpcacclient.HpcAC
 }
 
-func (a *ShuguangAiCollector) getResourceSpecs() {
-
+func (a *ShuguangAiCollector) getResourceSpecs() (*ResourceSpecs, error) {
+	return nil, nil
 }
diff --git a/pkg/scheduler/collector/collector.go b/pkg/scheduler/collector/collector.go
index 73bcffd0..06f31d24 100644
--- a/pkg/scheduler/collector/collector.go
+++ b/pkg/scheduler/collector/collector.go
@@ -1,7 +1,7 @@
 package collector
 
 type ResourceCollector interface {
-	getResourceSpecs() ([]ResourceSpecs, error)
+	getResourceSpecs() (*ResourceSpecs, error)
 }
 
 type ResourceSpecs struct {
@@ -10,6 +10,7 @@ type ResourceSpecs struct {
 	DiskAvail float64
 	GpuAvail  float64
 	CardAvail []Card
+	Balance   float64
 }
 
 type Card struct {
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
index e04952a9..b981f37a 100644
--- a/pkg/scheduler/scheduler.go
+++ b/pkg/scheduler/scheduler.go
@@ -19,6 +19,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/logx"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler/collector"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/client/participantservice"
 	"gorm.io/gorm"
 	"sigs.k8s.io/yaml"
@@ -26,12 +27,14 @@ import (
 )
 
 type scheduler struct {
-	task            *response.TaskInfo
-	participantIds  []int64
-	scheduleService scheduleService
-	dbEngin         *gorm.DB
-	result          []string //pID:子任务yamlstring 键值对
-	participantRpc  participantservice.ParticipantService
+	task               *response.TaskInfo
+	participantIds     []int64
+	scheduleService    scheduleService
+	dbEngin            *gorm.DB
+	result             []string //pID:子任务yamlstring 键值对
+	participantRpc     participantservice.ParticipantService
+	resourceCollectors []collector.ResourceCollector
+	//storelink
 }
 
 func NewScheduler(scheduleService scheduleService, val string, dbEngin *gorm.DB, participantRpc participantservice.ParticipantService) (*scheduler, error) {