route

models/cloudbrain.go

@@ -99,6 +99,7 @@ type Cloudbrain struct {
 	CanDel           bool      `xorm:"-"`
 	CanModify        bool      `xorm:"-"`
 	Type             int
+	BenchmarkType    string	   `xorm:"DEFAULT ''"`
 
 	VersionID       int64  //版本id
 	VersionName     string `xorm:"INDEX"` //当前版本
@@ -380,6 +381,15 @@ type Category struct {
 	Value string `json:"value"`
 }
 
+type BenchmarkTypes struct {
+	BenchmarkType []*BenchmarkType `json:"type"`
+}
+
+type BenchmarkType struct {
+	Id    int    `json:"id"`
+	Value string `json:"value"`
+}
+
 type GpuInfos struct {
 	GpuInfo []*GpuInfo `json:"gpu_type"`
 }

modules/auth/cloudbrain.go

@@ -14,6 +14,7 @@ type CreateCloudBrainForm struct {
 	BenchmarkCategory string `form:"get_benchmark_category"`
 	GpuType           string `form:"gpu_type"`
 	ResourceSpecId    int    `form:"resource_spec_id" binding:"Required"`
+	BenchmarkType	  string `form:"benchmark_type"`
 }
 
 type CommitImageCloudBrainForm struct {

modules/cloudbrain/cloudbrain.go

@@ -105,7 +105,7 @@ func AdminOrJobCreaterRight(ctx *context.Context) {
 
 }
 
-func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, brainScorePath, jobType, gpuQueue string, resourceSpecId int) error {
+func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, brainScorePath, jobType, gpuQueue, benchmarkType string, resourceSpecId int) error {
 	dataActualPath := setting.Attachment.Minio.RealPath +
 		setting.Attachment.Minio.Bucket + "/" +
 		setting.Attachment.Minio.BasePath +
@@ -217,6 +217,7 @@ func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath,
 		GpuQueue:       gpuQueue,
 		ResourceSpecId: resourceSpecId,
 		ComputeResource: models.GPUResource,
+		BenchmarkType:   benchmarkType,
 	})
 
 	if err != nil {
@@ -339,6 +340,7 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newJobID *string
 		GpuQueue:       task.GpuQueue,
 		ResourceSpecId: task.ResourceSpecId,
 		ComputeResource: task.ComputeResource,
+		BenchmarkType:   task.BenchmarkType,
 	}
 
 	err = models.RestartCloudbrain(task, newTask)

modules/setting/setting.go

@@ -467,6 +467,7 @@ var (
 	BenchmarkName       string
 	BenchmarkServerHost string
 	BenchmarkCategory   string
+	BenchmarkTypes   	string
 
 	//snn4imagenet config
 	IsSnn4imagenetEnabled  bool
@@ -1270,6 +1271,7 @@ func NewContext() {
 	BenchmarkName = sec.Key("NAME").MustString("")
 	BenchmarkServerHost = sec.Key("HOST").MustString("")
 	BenchmarkCategory = sec.Key("CATEGORY").MustString("")
+	BenchmarkTypes = sec.Key("TYPES").MustString("")
 
 	sec = Cfg.Section("snn4imagenet")
 	IsSnn4imagenetEnabled = sec.Key("ENABLED").MustBool(false)

routers/repo/cloudbrain.go

@@ -28,15 +28,17 @@ import (
 )
 
 const (
-	tplCloudBrainIndex      base.TplName = "repo/cloudbrain/index"
 	tplCloudBrainNew        base.TplName = "repo/cloudbrain/new"
 	tplCloudBrainShow       base.TplName = "repo/cloudbrain/show"
 	tplCloudBrainShowModels base.TplName = "repo/cloudbrain/models/index"
+
+	tplCloudBrainBenchmarkNew        base.TplName = "repo/cloudbrain/benchmark/new"
 )
 
 var (
 	gpuInfos   *models.GpuInfos
 	categories *models.Categories
+	benchmarkTypes *models.BenchmarkTypes
 )
 
 var jobNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$`)
@@ -124,6 +126,11 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error {
 	}
 	ctx.Data["benchmark_categories"] = categories.Category
 
+	if benchmarkTypes == nil {
+		json.Unmarshal([]byte(setting.BenchmarkTypes), &benchmarkTypes)
+	}
+	ctx.Data["benchmark_types"] = benchmarkTypes.BenchmarkType
+
 	if gpuInfos == nil {
 		json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos)
 	}
@@ -157,6 +164,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	image := form.Image
 	uuid := form.Attachment
 	jobType := form.JobType
+	command := cloudbrain.Command
 	gpuQueue := form.GpuType
 	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
 	resourceSpecId := form.ResourceSpecId
@@ -173,13 +181,6 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 		return
 	}
 
-	var command string
-	if jobType == string(models.JobTypeBenchmark) {
-		command = cloudbrain.CommandBenchmark
-	} else {
-		command = cloudbrain.Command
-	}
-
 	count, err := models.GetCloudbrainCountByUserID(ctx.User.ID, jobType)
 	if err != nil {
 		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
@@ -244,18 +245,14 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	err = cloudbrain.GenerateTask(ctx, 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, resourceSpecId)
+		storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), jobType, gpuQueue, "", resourceSpecId)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
 		ctx.RenderWithErr(err.Error(), tplCloudBrainNew, &form)
 		return
 	}
 
-	if jobType == string(models.JobTypeBenchmark) {
-		ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
-	} else {
-		ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
-	}
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
 }
 
 func CloudBrainRestart(ctx *context.Context) {
@@ -934,3 +931,152 @@ func SyncCloudbrainStatus() {
 
 	return
 }
+
+func CloudBrainBenchmarkIndex(ctx *context.Context) {
+	MustEnableCloudbrain(ctx)
+	repo := ctx.Repo.Repository
+	page := ctx.QueryInt("page")
+	if page <= 0 {
+		page = 1
+	}
+
+	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
+		ListOptions: models.ListOptions{
+			Page:     page,
+			PageSize: setting.UI.IssuePagingNum,
+		},
+		RepoID:     repo.ID,
+		Type:       models.TypeCloudBrainOne,
+		JobType:    string(models.JobTypeBenchmark),
+	})
+	if err != nil {
+		ctx.ServerError("Get debugjob faild:", err)
+		return
+	}
+
+	for i, task := range ciTasks {
+		ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
+		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
+	}
+
+	pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5)
+	pager.AddParam(ctx, "debugListType", "ListType")
+	ctx.Data["Page"] = pager
+	ctx.Data["PageIsCloudBrain"] = true
+	ctx.Data["Tasks"] = ciTasks
+	ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx)
+	ctx.Data["RepoIsEmpty"] = repo.IsEmpty
+	ctx.HTML(200, tplDebugJobIndex)
+}
+
+func CloudBrainBenchmarkNew(ctx *context.Context) {
+	err := cloudBrainNewDataPrepare(ctx)
+	if err != nil {
+		ctx.ServerError("get new cloudbrain info failed", err)
+		return
+	}
+	ctx.HTML(200, tplCloudBrainBenchmarkNew)
+}
+
+func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
+	ctx.Data["PageIsCloudBrain"] = true
+	jobName := form.JobName
+	image := form.Image
+	uuid := form.Attachment
+	jobType := form.JobType
+	gpuQueue := form.GpuType
+	command := cloudbrain.CommandBenchmark
+	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+	resourceSpecId := form.ResourceSpecId
+	benchmarkType := form.BenchmarkType
+
+	if !jobNamePattern.MatchString(jobName) {
+		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	if jobType != string(models.JobTypeBenchmark) {
+		log.Error("jobtype error:", jobType, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("jobtype error", tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	count, err := models.GetCloudbrainCountByUserID(ctx.User.ID, jobType)
+	if err != nil {
+		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
+		return
+	} else {
+		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)
+			return
+		}
+	}
+
+	_, err = models.GetCloudbrainByName(jobName)
+	if err == nil {
+		log.Error("the job name did already exist", ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("the job name did already exist", tplCloudBrainBenchmarkNew, &form)
+		return
+	} else {
+		if !models.IsErrJobNotExist(err) {
+			log.Error("system error, %v", err, ctx.Data["MsgID"])
+			cloudBrainNewDataPrepare(ctx)
+			ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
+			return
+		}
+	}
+	repo := ctx.Repo.Repository
+	if err := downloadCode(repo, codePath); err != nil {
+		log.Error("system error, %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	if err := uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
+		log.Error("system error, %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath
+	var gpuType string
+	for _, gpuInfo := range gpuInfos.GpuInfo {
+		if gpuInfo.Queue == gpuQueue {
+			gpuType = gpuInfo.Value
+		}
+	}
+
+	if err := downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BenchmarkName, benchmarkPath, form.BenchmarkCategory, gpuType); err != nil {
+		log.Error("system error, %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	if err := uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/"); err != nil {
+		log.Error("system error, %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	err = cloudbrain.GenerateTask(ctx, 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, benchmarkType, resourceSpecId)
+	if err != nil {
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, &form)
+		return
+	}
+
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+}

routers/routes/routes.go

@@ -979,6 +979,18 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 			m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainNew)
 			m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainCreate)
+
+			m.Group("/benchmark", func() {
+				m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchmarkIndex)
+				m.Group("/:jobid", func() {
+					m.Get("", reqRepoCloudBrainReader, repo.CloudBrainShow)
+					m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop)
+					m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainDel)
+					m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate)
+				})
+				m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
+				m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
+			})
 		}, context.RepoRef())
 		m.Group("/modelmanage", func() {
 			m.Post("/create_model", reqRepoModelManageWriter, repo.SaveModel)