From c76720d5db76c67dd85ea6b89d7fb7d63adacee2 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Mon, 30 May 2022 17:45:30 +0800
Subject: [PATCH] update

---
 routers/api/v1/repo/cloudbrain_dashboard.go | 24 ++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go
index ac4fb73a6..02c797bca 100644
--- a/routers/api/v1/repo/cloudbrain_dashboard.go
+++ b/routers/api/v1/repo/cloudbrain_dashboard.go
@@ -367,6 +367,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	cloudTwoJobTypeRes := make(map[string]int)
 	intelligentNetJobTypeRes := make(map[string]int)
 	cloudBrainPeriodNum := make(map[int]int)
+	cloudBrainComputeResource := make(map[string]int)
 	for _, cloudbrain := range cloudbrains {
 		if int64(cloudbrain.Cloudbrain.CreatedUnix) >= beginTime.Unix() && int64(cloudbrain.Cloudbrain.CreatedUnix) < endTime.Unix() {
 			if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
@@ -390,6 +391,12 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 				cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type] += 1
 			}
 
+			if _, ok := cloudBrainComputeResource[cloudbrain.Cloudbrain.ComputeResource]; !ok {
+				cloudBrainComputeResource[cloudbrain.Cloudbrain.ComputeResource] = 1
+			} else {
+				cloudBrainComputeResource[cloudbrain.Cloudbrain.ComputeResource] += 1
+			}
+
 		}
 	}
 
@@ -411,16 +418,23 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 			cloudBrainPeriodNum[v] = 0
 		}
 	}
-	// totalTasksCount := cloudBrainPeriodNum[0] + cloudBrainPeriodNum[1] + cloudBrainPeriodNum[2]
+
+	ComputeResourceList := []string{"CPU/GPU", "NPU"}
+	for _, v := range ComputeResourceList {
+		if _, ok := cloudBrainComputeResource[v]; !ok {
+			cloudBrainComputeResource[v] = 0
+		}
+	}
 
 	cloudOneJobTypeRes["EVALUATION"] = cloudOneJobTypeRes["BENCHMARK"] + cloudOneJobTypeRes["SNN4IMAGENET"] + cloudOneJobTypeRes["BRAINSCORE"]
 	cloudTwoJobTypeRes["EVALUATION"] = cloudTwoJobTypeRes["BENCHMARK"] + cloudTwoJobTypeRes["SNN4IMAGENET"] + cloudTwoJobTypeRes["BRAINSCORE"]
 	intelligentNetJobTypeRes["EVALUATION"] = intelligentNetJobTypeRes["BENCHMARK"] + intelligentNetJobTypeRes["SNN4IMAGENET"] + intelligentNetJobTypeRes["BRAINSCORE"]
 	ctx.JSON(http.StatusOK, map[string]interface{}{
-		"cloudOneJobTypeRes":       cloudOneJobTypeRes,
-		"cloudTwoJobTypeRes":       cloudTwoJobTypeRes,
-		"intelligentNetJobTypeRes": intelligentNetJobTypeRes,
-		"cloudBrainPeriodNum":      cloudBrainPeriodNum,
+		"cloudOneJobTypeRes":        cloudOneJobTypeRes,
+		"cloudTwoJobTypeRes":        cloudTwoJobTypeRes,
+		"intelligentNetJobTypeRes":  intelligentNetJobTypeRes,
+		"cloudBrainPeriodNum":       cloudBrainPeriodNum,
+		"cloudBrainComputeResource": cloudBrainComputeResource,
 	})
 }