Merge branch 'gpu-inference' of git.openi.org.cn:OpenI/aiforge into gpu-inference

modules/auth/cloudbrain.go

@@ -69,6 +69,7 @@ type CreateCloudBrainInferencForm struct {
 	ModelName         string `form:"model_name" binding:"Required"`
 	ModelVersion      string `form:"model_version" binding:"Required"`
 	CkptName          string `form:"ckpt_name" binding:"Required"`
+	LabelName         string `form:"label_names" binding:"Required"`
 }
 
 func (f *CreateCloudBrainForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

modules/cloudbrain/cloudbrain.go

@@ -78,6 +78,7 @@ type GenerateCloudBrainTaskReq struct {
 	ModelName            string
 	ModelVersion         string
 	CkptName             string
+	LabelName            string
 }
 
 func GetCloudbrainDebugCommand() string {
@@ -400,6 +401,7 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error {
 		ModelVersion:         req.ModelVersion,
 		CkptName:             req.CkptName,
 		ResultUrl:            req.ResultPath,
+		LabelName:            req.LabelName,
 		CreatedUnix:          createTime,
 		UpdatedUnix:          createTime,
 		CommitID:             req.CommitID,

routers/api/v1/repo/cloudbrain.go

@@ -157,15 +157,15 @@ func DelCloudBrainJob(ctx *context.APIContext) {
 
 	if errStr != "" {
 		ctx.JSON(http.StatusOK, map[string]interface{}{
-			"message":     ctx.Tr(errStr),
+			"Message":     ctx.Tr(errStr),
 			"VersionName": "1",
-			"code":        1,
+			"Code":        1,
 		})
 	} else {
 		ctx.JSON(http.StatusOK, map[string]interface{}{
-			"message":     "",
+			"Message":     "",
 			"VersionName": "1",
-			"code":        0,
+			"Code":        0,
 		})
 	}
 

routers/repo/cloudbrain.go

@@ -380,6 +380,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, form auth.CreateCloudBra
 	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
 	resourceSpecId := form.ResourceSpecId
 	branchName := form.BranchName
+	labelName := form.LabelName
 	repo := ctx.Repo.Repository
 
 	ckptUrl := setting.Attachment.Minio.RealPath + form.TrainUrl + form.CkptName
@@ -475,6 +476,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, form auth.CreateCloudBra
 		ModelVersion:     form.ModelVersion,
 		CkptName:         form.CkptName,
 		TrainUrl:         form.TrainUrl,
+		LabelName:        labelName,
 	}
 
 	err = cloudbrain.GenerateTask(req)