diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 9784a58b5..d9db9ef23 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -165,6 +165,7 @@ type TaskInfo struct { Username string `json:"username"` TaskName string `json:"task_name"` CodeName string `json:"code_name"` + BenchmarkCategory string `json:"selected_category"` } func ConvertToTaskPod(input map[string]interface{}) (TaskPod, error) { @@ -265,6 +266,15 @@ type ImageInfo struct { PlaceView string } +type Categories struct { + Category []*Category `json:"category"` +} + +type Category struct { + Id int `json:"id"` + Value string `json:"value"` +} + type CommitImageParams struct { Ip string `json:"ip"` TaskContainerId string `json:"taskContainerId"` diff --git a/modules/auth/cloudbrain.go b/modules/auth/cloudbrain.go index 2470c2ad6..462e4211f 100755 --- a/modules/auth/cloudbrain.go +++ b/modules/auth/cloudbrain.go @@ -11,6 +11,7 @@ type CreateCloudBrainForm struct { Command string `form:"command" binding:"Required"` Attachment string `form:"attachment" binding:"Required"` JobType string `form:"job_type" binding:"Required"` + BenchmarkCategory string `form:"get_benchmark_category"` } type CommitImageCloudBrainForm struct { diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 65fddc7a0..9926c154e 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -443,6 +443,7 @@ var ( IsBenchmarkEnabled bool BenchmarkCode string BenchmarkServerHost string + BenchmarkCategory string //snn4imagenet config IsSnn4imagenetEnabled bool @@ -1150,6 +1151,7 @@ func NewContext() { IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) BenchmarkCode = sec.Key("BENCHMARKCODE").MustString("https://yangzhx:justfortest123@git.openi.org.cn/yangzhx/detection_benchmark_script.git") BenchmarkServerHost = sec.Key("HOST").MustString("http://192.168.202.90:3366/") + BenchmarkCategory = sec.Key("CATEGORY").MustString("") sec = Cfg.Section("snn4imagenet") IsSnn4imagenetEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 30542e26e..952177d61 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -108,7 +108,6 @@ func CloudBrainNew(ctx *context.Context) { } for i, payload := range resultPublic.Payload.ImageInfo { - log.Info(resultPublic.Payload.ImageInfo[i].Place) if strings.HasPrefix(resultPublic.Payload.ImageInfo[i].Place, "192.168") { resultPublic.Payload.ImageInfo[i].PlaceView = payload.Place[strings.Index(payload.Place, "/"):len(payload.Place)] } else { @@ -131,6 +130,10 @@ func CloudBrainNew(ctx *context.Context) { ctx.Data["model_path"] = cloudbrain.ModelMountPath ctx.Data["benchmark_path"] = cloudbrain.BenchMarkMountPath ctx.Data["is_benchmark_enabled"] = setting.IsBenchmarkEnabled + + var categories *models.Categories + json.Unmarshal([]byte(setting.BenchmarkCategory), &categories) + ctx.Data["benchmark_categories"] = categories.Category ctx.Data["snn4imagenet_path"] = cloudbrain.Snn4imagenetMountPath ctx.Data["is_snn4imagenet_enabled"] = setting.IsSnn4imagenetEnabled ctx.HTML(200, tplCloudBrainNew) @@ -162,12 +165,12 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) { - downloadRateCode(repo, jobName, setting.BenchmarkCode, benchmarkPath) + downloadRateCode(repo, jobName, setting.BenchmarkCode, benchmarkPath, form.BenchmarkCategory) } snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) { - downloadRateCode(repo, jobName, setting.Snn4imagenetCode, snn4imagenetPath) + downloadRateCode(repo, jobName, setting.Snn4imagenetCode, snn4imagenetPath, "") } err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, jobType) @@ -258,16 +261,15 @@ func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrain func CloudBrainStop(ctx *context.Context) { var jobID = ctx.Params(":jobid") - log.Info(jobID) task, err := models.GetCloudbrainByJobID(jobID) if err != nil { ctx.ServerError("GetCloudbrainByJobID failed", err) return } - if task.Status != string(models.JobRunning) { - log.Error("the job(%s) is not running", task.JobName) - ctx.ServerError("the job is not running", errors.New("the job is not running")) + if task.Status == string(models.JobStopped) { + log.Error("the job(%s) has been stopped", task.JobName) + ctx.ServerError("the job has been stopped", errors.New("the job has been stopped")) return } @@ -337,7 +339,7 @@ func downloadCode(repo *models.Repository, codePath string) error { return nil } -func downloadRateCode(repo *models.Repository, taskName, gitPath, codePath string) error { +func downloadRateCode(repo *models.Repository, taskName, gitPath, codePath, benchmarkCategory string) error { err := os.MkdirAll(codePath, os.ModePerm) if err != nil { log.Error("mkdir codePath failed", err.Error()) @@ -366,6 +368,7 @@ func downloadRateCode(repo *models.Repository, taskName, gitPath, codePath strin Username: repo.Owner.Name, TaskName: taskName, CodeName: repo.Name, + BenchmarkCategory: benchmarkCategory, }) if err != nil { log.Error("json.Marshal failed", err.Error()) diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index 1c164bc0c..8f29f371b 100755 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -33,7 +33,7 @@
{{.i18n.Tr "custom.foot.copyright"}} 京ICP备18004880号-2
- {{.i18n.Tr "powered_by 鹏城实验室云脑、"}}Trustie确实、{{.i18n.Tr "、gitea"}} + {{.i18n.Tr "powered_by 鹏城实验室云脑、"}}Trustie确实{{.i18n.Tr "、gitea"}}
diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl index 0dc0aa090..9a58a05a6 100755 --- a/templates/repo/cloudbrain/index.tmpl +++ b/templates/repo/cloudbrain/index.tmpl @@ -297,9 +297,9 @@
-
+ {{$.CsrfTokenHtml}} - 停止 + 停止
diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index ddbe087d3..936420179 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -110,7 +110,6 @@ {{.i18n.Tr "repo.cloudbrain.new"}}
-
@@ -125,6 +124,17 @@
+
+ + +
+ + +
+