diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..8364976de --- /dev/null +++ b/.prettierignore @@ -0,0 +1,4 @@ +# Ignore artifacts: +dist +build +coverage diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1 @@ +{} diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 480350c8d..e28ba3ea5 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -160,6 +160,7 @@ type Cloudbrain struct { User *User `xorm:"-"` Repo *Repository `xorm:"-"` + BenchmarkType string `xorm:"-"` //算法评测，模型评测 BenchmarkTypeName string `xorm:"-"` BenchmarkTypeRankLink string `xorm:"-"` StartTime timeutil.TimeStamp @@ -1565,6 +1566,11 @@ func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) { return int(count), err } +func GetBenchmarkCountByUserID(userID int64) (int, error) { + count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain)) + return int(count), err +} + func GetCloudbrainNotebookCountByUserID(userID int64) (int, error) { count, err := x.In("status", ModelArtsCreateQueue, ModelArtsCreating, ModelArtsStarting, ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsRestarting). And("job_type = ? and user_id = ? and type = ?", JobTypeDebug, userID, TypeCloudBrainTwo).Count(new(Cloudbrain)) diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index f1d3cb344..3dee3a3fa 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -28,6 +28,8 @@ const ( Snn4imagenetMountPath = "/snn4imagenet" BrainScoreMountPath = "/brainscore" TaskInfoName = "/taskInfo" + Snn4imagenetCommand = `/opt/conda/bin/python /snn4imagenet/testSNN_script.py --modelname '%s' --modelpath '/dataset' --modeldescription '%s'` + BrainScoreCommand = `bash /brainscore/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/dataset' -d '%s'` SubTaskName = "task1" @@ -347,7 +349,7 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, } stringId := strconv.FormatInt(task.ID, 10) - if string(models.JobTypeBenchmark) == jobType { + if IsBenchmarkJob(jobType) { notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, stringId, displayJobName, models.ActionCreateBenchMarkTask) } else if string(models.JobTypeTrain) == jobType { notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, displayJobName, models.ActionCreateGPUTrainTask) @@ -358,6 +360,10 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, return nil } +func IsBenchmarkJob(jobType string) bool { + return string(models.JobTypeBenchmark) == jobType || string(models.JobTypeBrainScore) == jobType || string(models.JobTypeSnn4imagenet) == jobType +} + func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) error { dataActualPath := setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + diff --git a/modules/setting/setting.go b/modules/setting/setting.go index eee539d0c..2fd1a1b9c 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -478,10 +478,11 @@ var ( BenchmarkMaxDuration int64 //snn4imagenet config - IsSnn4imagenetEnabled bool - Snn4imagenetOwner string - Snn4imagenetName string - Snn4imagenetServerHost string + IsSnn4imagenetEnabled bool + Snn4imagenetOwner string + Snn4imagenetName string + Snn4imagenetServerHost string + ModelBenchmarkMaxDuration int64 //snn4imagenet config IsBrainScoreEnabled bool @@ -1309,6 +1310,7 @@ func NewContext() { Snn4imagenetOwner = sec.Key("OWNER").MustString("") Snn4imagenetName = sec.Key("NAME").MustString("") Snn4imagenetServerHost = sec.Key("HOST").MustString("") + ModelBenchmarkMaxDuration = sec.Key("MAX_DURATION").MustInt64(28800) sec = Cfg.Section("brainscore") IsBrainScoreEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 83a34185a..7cd1d8486 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1116,12 +1116,18 @@ modelarts.train_job_para.connfirm=train_job_para.connfirm modelarts.evaluate_job=Model Evaluation modelarts.evaluate_job.new_job=New Model Evaluation + cloudbrain.benchmark.evaluate_type=Evaluation Type +cloudbrain.benchmark.evaluate_scenes = Evaluation Scenes +cloudbrain.benchmark.algorithm=Algorithm Evaluation +cloudbrain.benchmark.model=Model Evaluation cloudbrain.benchmark.evaluate_child_type=Child Type cloudbrain.benchmark.evaluate_mirror=Mirror cloudbrain.benchmark.evaluate_train=Train Script cloudbrain.benchmark.evaluate_test=Test Script cloudbrain.benchmark.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"Target detection","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"Target re-identification","second":[{"id":1,"value":"Vehicle re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"Image-based person re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"Multi-target tracking","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]} +cloudbrain.morethanonejob=You already have a running or waiting task, create it after that task is over. + modelarts.infer_job_model = Model modelarts.infer_job_model_file = Model File @@ -3039,8 +3045,9 @@ shared_memory = Shared Memory DEBUG = DEBUG -SNN4IMAGENET = SNN4IMAGENET -BRAINSCORE = BRAINSCORE +SNN4IMAGENET = BENCHMARK +BRAINSCORE = BENCHMARK TRAIN = TRAIN INFERENCE = INFERENCE BENCHMARK = BENCHMARK +brain_area = Brain Area diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index ff261057f..dd2e656d9 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1128,12 +1128,17 @@ modelarts.train_job_para.edit=编辑 modelarts.train_job_para.connfirm=确定 modelarts.evaluate_job=评测任务 modelarts.evaluate_job.new_job=新建评测任务 +cloudbrain.benchmark.evaluate_scenes = 评测场景 cloudbrain.benchmark.evaluate_type=评测类型 +cloudbrain.benchmark.algorithm=算法评测 +cloudbrain.benchmark.model=模型评测 cloudbrain.benchmark.evaluate_child_type=子类型 cloudbrain.benchmark.evaluate_mirror=镜像 cloudbrain.benchmark.evaluate_train=训练程序 cloudbrain.benchmark.evaluate_test=测试程序 cloudbrain.benchmark.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"目标检测","second":[{"id":1,"value":"无","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"目标重识别","second":[{"id":1,"value":"车辆重识别","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"基于图像的行人重识别","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"多目标跟踪","second":[{"id":1,"value":"无","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]} +cloudbrain.benchmark.model.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"目标检测","second":[{"id":1,"value":"无","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"目标重识别","second":[{"id":1,"value":"车辆重识别","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"基于图像的行人重识别","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"多目标跟踪","second":[{"id":1,"value":"无","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]} +cloudbrain.morethanonejob=您已经创建了一个正在等待或运行中的同类任务，请等待任务结束再创建。 modelarts.infer_job_model = 模型名称 modelarts.infer_job_model_file = 模型文件 @@ -3050,9 +3055,10 @@ memory = 内存 shared_memory = 共享内存 DEBUG = 调试任务 -SNN4IMAGENET = 调试任务-脉冲神经网络图片分类测评 -BRAINSCORE = 调试任务-神经相似性测评 +SNN4IMAGENET = 评测任务 +BRAINSCORE = 评测任务 TRAIN = 训练任务 INFERENCE = 推理任务 BENCHMARK = 评测任务 +brain_area = 脑区 diff --git a/package-lock.json b/package-lock.json index f5a941869..9233b813b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1123,6 +1123,12 @@ "vue-template-es2015-compiler": "^1.9.0" }, "dependencies": { + "prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "optional": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -11003,10 +11009,10 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "optional": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "dev": true }, "pretty-error": { "version": "2.1.1", diff --git a/package.json b/package.json index 0f93faaea..748291d5c 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "eslint-config-airbnb-base": "14.1.0", "eslint-plugin-import": "2.20.2", "eslint-plugin-vue": "6.2.2", + "prettier": "2.6.2", "script-loader": "0.7.2", "stylelint": "13.3.3", "stylelint-config-standard": "20.0.0", @@ -78,4 +79,4 @@ "browserslist": [ "defaults" ] -} +} \ No newline at end of file diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go index 6687b990a..0481e6743 100755 --- a/routers/admin/cloudbrains.go +++ b/routers/admin/cloudbrains.go @@ -52,8 +52,8 @@ func CloudBrains(ctx *context.Context) { var jobTypes []string jobTypeNot := false - if jobType == string(models.JobTypeDebug) { - jobTypes = append(jobTypes, string(models.JobTypeSnn4imagenet), string(models.JobTypeBrainScore), string(models.JobTypeDebug)) + if jobType == string(models.JobTypeBenchmark) { + jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)) } else if jobType != "all" && jobType != "" { jobTypes = append(jobTypes, jobType) } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index e5a61b9a7..b14d29a83 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -188,6 +188,8 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error { ctx.Data["cloudbraintype"] = models.TypeCloudBrainOne + ctx.Data["benchmarkMode"] = ctx.Query("benchmarkMode") + return nil } @@ -249,7 +251,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { return } - if jobType != string(models.JobTypeBenchmark) && jobType != string(models.JobTypeDebug) && jobType != string(models.JobTypeSnn4imagenet) && jobType != string(models.JobTypeBrainScore) && jobType != string(models.JobTypeTrain) { + if jobType != string(models.JobTypeBenchmark) && jobType != string(models.JobTypeDebug) && jobType != string(models.JobTypeTrain) { log.Error("jobtype error:", jobType, ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) ctx.RenderWithErr("jobtype error", tpl, &form) @@ -266,7 +268,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { if count >= 1 { log.Error("the user already has running or waiting task", ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) - ctx.RenderWithErr("you have already a running or waiting task, can not create more", tpl, &form) + ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tpl, &form) return } } @@ -379,7 +381,7 @@ func CloudBrainRestart(ctx *context.Context) { if count >= 1 { log.Error("the user already has running or waiting task", ctx.Data["MsgID"]) resultCode = "-1" - errorMsg = "you have already a running or waiting task, can not create more" + errorMsg = ctx.Tr("repo.cloudbrain.morethanonejob") break } } @@ -524,6 +526,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo for _, benchmarkType := range GetBenchmarkTypes(ctx).BenchmarkType { if task.BenchmarkTypeID == benchmarkType.Id { ctx.Data["BenchmarkTypeName"] = benchmarkType.First + task.BenchmarkTypeName = benchmarkType.First for _, benchmarkChildType := range benchmarkType.Second { if task.BenchmarkChildTypeID == benchmarkChildType.Id { ctx.Data["BenchmarkChildTypeName"] = benchmarkChildType.Value @@ -534,6 +537,19 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo } } } + + if task.JobType == string(models.JobTypeBenchmark) { + task.BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.algorithm") + } else if task.JobType == string(models.JobTypeSnn4imagenet) || task.JobType == string(models.JobTypeBrainScore) { + task.BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.model") + task.BenchmarkTypeName = task.JobType + ctx.Data["BenchmarkTypeName"] = task.JobType + if task.JobType == string(models.JobTypeBrainScore) { + ctx.Data["BenchmarkChildTypeName"] = getBrainRegion(task.BenchmarkChildTypeID) + } + + } + if task.TrainJobDuration == "" { if task.Duration == 0 { var duration int64 @@ -1385,6 +1401,8 @@ func SyncCloudbrainStatus() { var maxDuration int64 if task.JobType == string(models.JobTypeBenchmark) { maxDuration = setting.BenchmarkMaxDuration + } else if task.JobType == string(models.JobTypeSnn4imagenet) || task.JobType == string(models.JobTypeBrainScore) { + maxDuration = setting.ModelBenchmarkMaxDuration } else { maxDuration = setting.MaxDuration } @@ -1634,7 +1652,7 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) { } var jobTypes []string - jobTypes = append(jobTypes, string(models.JobTypeBenchmark)) + jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)) ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ ListOptions: models.ListOptions{ Page: page, @@ -1664,8 +1682,21 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) { } ciTasks[i].TrainJobDuration = models.ConvertDurationToStr(ciTasks[i].Duration) } - ciTasks[i].BenchmarkTypeName = "" + if ciTasks[i].JobType == string(models.JobTypeBenchmark) { + ciTasks[i].BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.algorithm") + } else if ciTasks[i].JobType == string(models.JobTypeSnn4imagenet) || ciTasks[i].JobType == string(models.JobTypeBrainScore) { + ciTasks[i].BenchmarkType = ctx.Tr("repo.cloudbrain.benchmark.model") + ciTasks[i].BenchmarkTypeName = ciTasks[i].JobType + + if ciTasks[i].JobType == string(models.JobTypeSnn4imagenet) { + ciTasks[i].BenchmarkTypeRankLink = setting.Snn4imagenetServerHost + } else { + ciTasks[i].BenchmarkTypeRankLink = setting.BrainScoreServerHost + } + + } + if task.BenchmarkTypeID > 0 { for _, benchmarkType := range GetBenchmarkTypes(ctx).BenchmarkType { if task.BenchmarkTypeID == benchmarkType.Id { @@ -1801,6 +1832,16 @@ func getBenchmarkResourceSpec(resourceSpecID int) (int, error) { } func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { + jobType := form.JobType + if jobType == string(models.JobTypeBenchmark) { + BenchMarkAlgorithmCreate(ctx, form) + } else { + ModelBenchmarkCreate(ctx, form) + } + +} + +func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { ctx.Data["PageIsCloudBrain"] = true displayJobName := form.DisplayJobName jobName := util.ConvertDisplayJobNameToJobName(displayJobName) @@ -1865,7 +1906,7 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF return } - count, err := models.GetCloudbrainCountByUserID(ctx.User.ID, string(models.JobTypeBenchmark)) + count, err := models.GetBenchmarkCountByUserID(ctx.User.ID) if err != nil { log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) @@ -1875,7 +1916,7 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF if count >= 1 { log.Error("the user already has running or waiting task", ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) - ctx.RenderWithErr("you have already a running or waiting task, can not create more", tplCloudBrainBenchmarkNew, &form) + ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tplCloudBrainBenchmarkNew, &form) return } } @@ -1953,10 +1994,118 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, &form) return } + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark") + +} + +func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { + ctx.Data["PageIsCloudBrain"] = true + displayJobName := form.DisplayJobName + jobName := util.ConvertDisplayJobNameToJobName(displayJobName) + image := form.Image + uuid := form.Attachment + jobType := form.JobType + gpuQueue := form.GpuType + codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath + resourceSpecId := form.ResourceSpecId + branchName := cloudbrain.DefaultBranchName + repo := ctx.Repo.Repository + + tpl := tplCloudBrainBenchmarkNew + command := cloudbrain.Command + + tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, jobType, displayJobName) + if err == nil { + if len(tasks) != 0 { + log.Error("the job name did already exist", ctx.Data["MsgID"]) + cloudBrainNewDataPrepare(ctx) + ctx.RenderWithErr("the job name did already exist", tpl, &form) + return + } + } else { + if !models.IsErrJobNotExist(err) { + log.Error("system error, %v", err, ctx.Data["MsgID"]) + cloudBrainNewDataPrepare(ctx) + ctx.RenderWithErr("system error", tpl, &form) + return + } + } + + if !jobNamePattern.MatchString(displayJobName) { + ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tpl, &form) + return + } + + if jobType != string(models.JobTypeSnn4imagenet) && jobType != string(models.JobTypeBrainScore) { + log.Error("jobtype error:", jobType, ctx.Data["MsgID"]) + cloudBrainNewDataPrepare(ctx) + ctx.RenderWithErr("jobtype error", tpl, &form) + return + } + + count, err := models.GetBenchmarkCountByUserID(ctx.User.ID) + if err != nil { + log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"]) + cloudBrainNewDataPrepare(ctx) + ctx.RenderWithErr("system error", tpl, &form) + return + } else { + if count >= 1 { + log.Error("the user already has running or waiting task", ctx.Data["MsgID"]) + cloudBrainNewDataPrepare(ctx) + ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tpl, &form) + return + } + } + + downloadCode(repo, codePath, branchName) + uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/") + + modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/" + mkModelPath(modelPath) + uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/") + + snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath + if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) { + downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "") + uploadCodeToMinio(snn4imagenetPath+"/", jobName, cloudbrain.Snn4imagenetMountPath+"/") + command = fmt.Sprintf(cloudbrain.Snn4imagenetCommand, displayJobName, trimSpaceNewlineInString(form.Description)) + + } + benchmarkChildTypeID := 0 + brainScorePath := setting.JobPath + jobName + cloudbrain.BrainScoreMountPath + if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) { + downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "") + uploadCodeToMinio(brainScorePath+"/", jobName, cloudbrain.BrainScoreMountPath+"/") + benchmarkChildTypeID = form.BenchmarkChildTypeID + command = fmt.Sprintf(cloudbrain.BrainScoreCommand, getBrainRegion(benchmarkChildTypeID), displayJobName, trimSpaceNewlineInString(form.Description)) + } + + err = cloudbrain.GenerateTask(ctx, displayJobName, jobName, image, command, uuid, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"), + storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"), + storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"), storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"), + storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), jobType, gpuQueue, form.Description, branchName, form.BootFile, form.Params, + 0, benchmarkChildTypeID, resourceSpecId) + if err != nil { + cloudBrainNewDataPrepare(ctx) + ctx.RenderWithErr(err.Error(), tpl, &form) + return + } ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark") } +func getBrainRegion(benchmarkChildTypeID int) string { + values := []string{"V1", "V2", "V4", "IT"} + return values[benchmarkChildTypeID] +} + +func trimSpaceNewlineInString(s string) string { + re := regexp.MustCompile(`\r?\n`) + return re.ReplaceAllString(s, " ") + +} + func BenchmarkDel(ctx *context.Context) { if err := deleteCloudbrainJob(ctx); err != nil { log.Error("deleteCloudbrainJob failed: %v", err, ctx.Data["msgID"]) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 81e1664a4..bcc6f6156 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -76,7 +76,7 @@ func DebugJobIndex(ctx *context.Context) { } var jobTypes []string - jobTypes = append(jobTypes, string(models.JobTypeSnn4imagenet), string(models.JobTypeBrainScore), string(models.JobTypeDebug)) + jobTypes = append(jobTypes, string(models.JobTypeDebug)) ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ ListOptions: models.ListOptions{ Page: page, diff --git a/routers/user/home.go b/routers/user/home.go index d92bc31c6..53aff19b8 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -778,8 +778,8 @@ func Cloudbrains(ctx *context.Context) { var jobTypes []string jobTypeNot := false - if jobType == string(models.JobTypeDebug) { - jobTypes = append(jobTypes, string(models.JobTypeSnn4imagenet), string(models.JobTypeBrainScore), string(models.JobTypeDebug)) + if jobType == string(models.JobTypeBenchmark) { + jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)) } else if jobType != "all" && jobType != "" { jobTypes = append(jobTypes, jobType) } diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index cf5df847c..60c3510a5 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -12,7 +12,8 @@
- + {{template "admin/navbar" .}}
{{template "base/alert" .}} @@ -314,17 +315,4 @@
-{{template "base/footer" .}} - +{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl index 34b4840fc..ddd616eb4 100644 --- a/templates/admin/cloudbrain/search.tmpl +++ b/templates/admin/cloudbrain/search.tmpl @@ -16,8 +16,8 @@ TRAIN INFERENCE BENCHMARK - SNN4IMAGENET - BRAINSCORE + SNN4IMAGENET + BRAINSCORE
diff --git a/templates/admin/cloudbrain/search_dashboard.tmpl b/templates/admin/cloudbrain/search_dashboard.tmpl index b5f5deaa1..61f02f182 100644 --- a/templates/admin/cloudbrain/search_dashboard.tmpl +++ b/templates/admin/cloudbrain/search_dashboard.tmpl @@ -18,7 +18,7 @@
-
+
diff --git a/templates/custom/select_dataset_train.tmpl b/templates/custom/select_dataset_train.tmpl index b8260f279..28fce2490 100644 --- a/templates/custom/select_dataset_train.tmpl +++ b/templates/custom/select_dataset_train.tmpl @@ -1,14 +1,17 @@
- {{if .newInference}} -      + {{if or (.benchmarkMode) (.newInference)}} +       {{else}}{{.i18n.Tr "dataset.dataset"}}    {{end}} {{else}}     {{end}} - {{.i18n.Tr "dataset.select_dataset"}} + {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}} + {{if .benchmarkMode}} + 说明：先使用数据集功能上传模型，然后从数据集列表选模型。 + {{end}}
- + {{if not .benchmarkMode}}
@@ -121,6 +124,7 @@
+ {{end}}
- .fontsize14{ - font-size: 14px; - } .padding0{ padding: 0 !important; } @@ -69,28 +66,31 @@
-
+
{{$.i18n.Tr "repo.cloudbrain_task"}}
-
+
{{$.i18n.Tr "repo.modelarts.status"}}
-
+
+ {{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}} +
+
{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}
-
+
{{$.i18n.Tr "repo.modelarts.createtime"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}
-
+
{{$.i18n.Tr "repo.modelarts.computing_resources"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_creator"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -101,36 +101,39 @@
-
+
{{.DisplayJobName}}
-
+
{{.Status}}
-
+
+ {{.BenchmarkType}} +
+
- {{.BenchmarkTypeName}} + {{.BenchmarkTypeName}}
-
+
{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
-
+
{{.TrainJobDuration}}
-
+
{{.ComputeResource}}
-
+
{{if .User.Name}} {{else}} @@ -138,7 +141,7 @@ {{end}}
-
+
@@ -154,10 +157,11 @@ {{end}}
+ {{if eq .JobType "BENCHMARK"}} {{$.i18n.Tr "repo.score"}} - + {{end}}
@@ -226,4 +230,4 @@
-{{template "base/footer" .}} +{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 0db184206..393076df3 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -1,70 +1,46 @@ {{template "base/head" .}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{template "repo/header" .}} @@ -74,168 +50,297 @@ {{.i18n.Tr "repo.modelarts.evaluate_job.new_job"}}
- - + + + {{if eq .benchmarkMode "model"}} + {{.CsrfTokenHtml}} - -
- - -
-
- - + +
+ {{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}} + {{.i18n.Tr "repo.cloudbrain.benchmark.model"}} +
+
+
+ + +
+
+ + +
-
+
- {{range .benchmark_gpu_types}} - + {{end}} -
+
+
+
+ + +
+ + + + + {{.i18n.Tr "cloudbrain.view_sample"}} +
- -
-
- -   - + {{range .benchmark_resource_specs}} + {{end}} -
-
- - - -
+
+
+ + {{.i18n.Tr "repo.cloudbrain.cancel"}} +
- -
- + + {{else}} +
+ {{.CsrfTokenHtml}} + + +
+ +
+ {{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}} + {{.i18n.Tr "repo.cloudbrain.benchmark.model"}} +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +   + +
+
+ + + +
+
+
+
-
+
- {{range .benchmark_resource_specs}} - + {{end}} -
+
-
- - - {{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}} -
+
+ + + {{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}} +
-
- - - {{.i18n.Tr "cloudbrain.view_sample"}} -
+
+ + + {{.i18n.Tr "cloudbrain.view_sample"}} +
-
- - {{.i18n.Tr "repo.cloudbrain.cancel"}} +
+ + {{.i18n.Tr "repo.cloudbrain.cancel"}} +
- - - + {{end}}
{{template "base/footer" .}} + \ No newline at end of file diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl index 944719dc7..2a2404f7c 100755 --- a/templates/repo/cloudbrain/benchmark/show.tmpl +++ b/templates/repo/cloudbrain/benchmark/show.tmpl @@ -1,165 +1,199 @@ {{template "base/head" .}}
@@ -171,7 +205,7 @@ td, th {
-{{template "repo/header" .}} + {{template "repo/header" .}}

@@ -183,11 +217,12 @@ td, th { {{$.i18n.Tr "repo.modelarts.evaluate_job"}}
/
-
{{.displayJobName}}
-
+
{{.displayJobName}}
+

{{range $k ,$v := .version_list_task}} -
+
@@ -197,18 +232,23 @@ td, th {
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + + {{end}} + {{$.i18n.Tr "repo.modelarts.status"}}： - {{.Status}} + {{.Status}} - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： - {{$.duration}} + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： + {{$.duration}}
@@ -219,8 +259,10 @@ td, th {
- {{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.modelarts.log"}} + {{$.i18n.Tr "repo.modelarts.train_job.config"}} + {{$.i18n.Tr "repo.modelarts.log"}}
@@ -250,31 +292,61 @@ td, th {
- - {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + {{$.i18n.Tr "repo.modelarts.createtime"}}
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} + {{TimeSinceUnix1 .CreatedUnix}}
+ + + + {{$.i18n.Tr "repo.cloudbrain.time.starttime"}} + + + +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+ + + + + + {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} + + + +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}} +
+ + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} -
+
{{$.duration}}
@@ -292,98 +364,156 @@ td, th { + {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}} + + + + +
+ {{.BenchmarkType}} +
+ + + + {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}} - + -
- {{$.BenchmarkTypeName}} +
+ {{.BenchmarkTypeName}}
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}} - -
- train.py -
-
- {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}} - -
- test.py -
-
- {{$.i18n.Tr "repo.modelarts.train_job.description"}} - -
- {{.Description}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{$.resource_spec}} -
-
- {{$.i18n.Tr "repo.cloudbrain_creator"}} - -
- {{.User.Name}} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -
+ {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}} + +
+ {{if eq .BenchmarkType "Benchmark"}} + train.py + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}} + +
+ {{if eq .BenchmarkType "Benchmark"}} + test.py + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.description"}} + +
+ {{if .Description}} + {{.Description}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "cloudbrain.gpu_type"}} + +
+ {{$.resource_type}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+ {{$.resource_spec}} +
+
+ {{$.i18n.Tr "repo.model_manager"}} + +
+ {{$.datasetname}} +
+
+ {{$.i18n.Tr "repo.cloudbrain_creator"}} + +
+ {{.User.Name}} +
+
+ {{if eq .BenchmarkTypeName "BRAINSCORE"}} + {{$.i18n.Tr "cloudbrain.brain_area"}} + {{else}} {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}} + {{end}} -
+
+ + {{if $.BenchmarkChildTypeName}} {{$.BenchmarkChildTypeName}} + {{else}} + -- + {{end}}
-
+ + + + +
@@ -394,9 +524,10 @@ td, th { -
- - +
+ + 

                             

 
@@ -435,19 +566,20 @@ td, th {
 {{template "base/footer" .}}
 
 
+
\ No newline at end of file
diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl
index e3e3dbd1c..c4596de37 100755
--- a/templates/repo/cloudbrain/new.tmpl
+++ b/templates/repo/cloudbrain/new.tmpl
@@ -156,12 +156,6 @@
                         
                         
                     

 
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl
index 0b0776c9b..9abee857c 100644
--- a/templates/user/dashboard/cloudbrains.tmpl
+++ b/templates/user/dashboard/cloudbrains.tmpl
@@ -12,7 +12,11 @@
 
 

 

-    
+    
     {{template "admin/cloudbrain/search_dashboard" .}}
     

         {{template "base/alert" .}}
@@ -94,7 +98,7 @@
                                 
                                 {{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}}
                                 

-                                    {{$JobType}}
+                                    {{$JobType}}
                                 

                                 
                                 

@@ -115,7 +119,7 @@
                                 

                                 
                                 

-                                    {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE"}}
+                                    {{if eq .JobType "DEBUG"}}
                                     

                                         

                                             {{$.CsrfTokenHtml}}
@@ -146,6 +150,14 @@
                                         
                                         {{end}}
                                     

+                                    {{if eq .JobType "BENCHMARK"}}
+                                    

+                                        
+                                            {{$.i18n.Tr "repo.score"}}
+                                        
+                                    

+                                    
+                                    {{end}}
                                     
                                     
                                         {{$.CsrfTokenHtml}}
@@ -195,7 +207,7 @@
                                 
                                 {{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}}
                                 

-                                    {{$JobType}}
+                                    {{$JobType}}
                                 

                                 
                                 

@@ -291,38 +303,4 @@
         

     

 

-{{template "base/footer" .}}
-
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/web_src/js/components/images/Images.vue b/web_src/js/components/images/Images.vue
index 4c0eb7839..2a42b8b9e 100644
--- a/web_src/js/components/images/Images.vue
+++ b/web_src/js/components/images/Images.vue
@@ -77,9 +77,11 @@
                             align="center"
                             >
                             
                         
                         
-

-    

-        

-        

-            
-            

-                

-                    

-                        
-                        
-                    

-                

-            

+    

+        

+            

+                

 
-            

-                仅显示平台推荐
-                
-                        
-                            {{dropdownPrivate}}
-                        
-                        
-                            全部
-                            公开
-                            私有
-                        
-                         
-            

-            

-                    创建云脑镜像
-            

-            

-                
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
+                            
+                            
+                                
+                            
+                            
+                                
+                            
+                            
+                                
+                            
+                            
+                                
+                            
+                            
+                                
+                            
+                        
+                    

+                    

+                        
+                        
+                    

+                

             

         

-        

-  

-

+    

+
 
-  
 
 
 
 
 
+    .header-wrapper {
+        background-color: #f5f5f6;
+        padding-top: 15px;
+    }
+
+    .image_text {
+        padding: 25px 0 55px 0;
+    }
+
+    #header {
+        position: relative;
+        top: -40px;
+    }
+
+    .el-dropdown-menu__item--divided {
+        border-top: 1px solid blue;
+    }
+
+    .el-table thead {
+        background-color: #f5f5f6;
+    }
+
+    /deep/ .el-tabs__item:hover {
+        color: #000;
+        font-weight: 500;
+
+    }
+
+    /deep/ .el-tabs__item.is-active {
+        color: #000;
+        font-weight: 500;
+    }
+
+    /deep/ .el-tabs__active-bar {
+        background-color: #000
+    }
+
+    #success {
+        background-color: #5bb973;
+        color: white;
+    }
+
+    .text-over {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: middle;
+        white-space: nowrap;
+    }
+
+    .image_title {
+        display: inline-block;
+
+        cursor: default;
+        color: rgb(66, 98, 144);
+    }
+
+    .image_desc {
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+
+    .heart-stroke {
+        stroke: #FA8C16;
+        stroke-width: 2;
+        fill: #fff
+    }
+
+    .stars_active {
+        fill: #FA8C16 !important;
+        stroke: #FA8C16 !important
+    }
+
+    .header-new-drop {
+        width: 100%;
+    }
+
\ No newline at end of file
diff --git a/web_src/js/components/images/selectImages.vue b/web_src/js/components/images/selectImages.vue
index 0b76d5ae4..cc706fd86 100644
--- a/web_src/js/components/images/selectImages.vue
+++ b/web_src/js/components/images/selectImages.vue
@@ -1,76 +1,87 @@
 
 
 
 
 
+    .header-wrapper {
+        background-color: #f5f5f6;
+        padding-top: 15px;
+    }
+
+    .image_text {
+        padding: 25px 0 55px 0;
+    }
+
+    #header {
+        position: relative;
+        top: -40px;
+    }
+
+    #success {
+        background-color: #5bb973;
+        color: white;
+    }
+
+    .text-over {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        vertical-align: middle;
+        white-space: nowrap;
+    }
+
+    .image_title {
+        display: inline-block;
+        width: 80%;
+        cursor: default;
+        color: rgb(66, 98, 144);
+    }
+
+    .image_desc {
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+
+    .heart-stroke {
+        stroke: #666;
+        stroke-width: 2;
+        fill: #fff
+    }
+
+    .stars_active {
+        fill: #FA8C16 !important;
+        stroke: #FA8C16 !important
+    }
+
\ No newline at end of file
diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js
index 5a12933f7..e1660e021 100644
--- a/web_src/js/features/cloudrbanin.js
+++ b/web_src/js/features/cloudrbanin.js
@@ -279,3 +279,52 @@ export default async function initCloudrain() {
     })
 }
 
+function userSearchControll() {
+    if ($('#userCloud').length === 0) {
+        return
+    }
+    const params = new URLSearchParams(window.location.search)
+    let jobType
+    if ($('.cloudbrain_debug').length === 1) {
+        if (!params.get('jobType')) {
+            jobType = $('.cloudbrain_debug').data('allTask')
+        } else {
+            if (params.get('jobType') === 'DEBUG') {
+                jobType = $('.cloudbrain_debug').data('debug-task')
+            } else if (params.get('jobType') === 'TRAIN') {
+                jobType = $('.cloudbrain_debug').data('train-task')
+            }
+            else if (params.get('jobType') === 'INFERENCE') {
+                jobType = $('.cloudbrain_debug').data('inference-task')
+            }
+            else {
+                jobType = $('.cloudbrain_debug').data('benchmark-task')
+            }
+        }
+    }
+    let listType = !params.get('listType') ? $('.cloudbrain_debug').data('all-compute') : params.get('listType')
+    let jobStatus = !params.get('jobStatus') ? $('.cloudbrain_debug').data('all-status') : params.get('jobStatus').toUpperCase()
+    const dropdownValueArray = [jobType, listType, jobStatus]
+    $('#userCloud .default.text ').each(function (index, e) {
+        $(e).text(dropdownValueArray[index])
+    })
+}
+
+function AdaminSearchControll() {
+    if ($('#adminCloud').length === 0) {
+        return
+    }
+    const params = new URLSearchParams(window.location.search)
+    let jobType = !params.get('jobType') ? $('.cloudbrain_debug').data('all-task') : params.get('jobType')
+    let listType = !params.get('listType') ? $('.cloudbrain_debug').data('all-compute') : params.get('listType')
+    let jobStatus = !params.get('jobStatus') ? $('.cloudbrain_debug').data('all-status') : params.get('jobStatus').toUpperCase()
+    const dropdownValueArray = [jobType, listType, jobStatus]
+    $('#adminCloud .default.text ').each(function (index, e) {
+        $(e).text(dropdownValueArray[index])
+    })
+}
+userSearchControll()
+AdaminSearchControll()
+
+
+