Merge branch 'V20220328' of git.openi.org.cn:OpenI/aiforge into cb-train

modules/modelarts/modelarts.go

@@ -51,6 +51,8 @@ const (
 	DataUrl          = "data_url"
 	ResultUrl        = "result_url"
 	CkptUrl          = "ckpt_url"
+	DeviceTarget     = "device_target"
+	Ascend           = "Ascend"
 	PerPage          = 10
 	IsLatestVersion  = "1"
 	NotLatestVersion = "0"

options/locale/locale_en-US.ini

@@ -913,7 +913,7 @@ gpu_type_all=All
 model_download=Model Download
 submit_image=Submit Image
 download=Download
-score=score
+score=Score
 
 cloudbrain=Cloudbrain
 cloudbrain.new=New cloudbrain

routers/repo/modelarts.go

@@ -993,17 +993,9 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		return
 	}
 
-	//todo: del local code?
-
 	var parameters models.Parameters
 	param := make([]models.Parameter, 0)
-	param = append(param, models.Parameter{
-		Label: modelarts.TrainUrl,
-		Value: outputObsPath,
-	}, models.Parameter{
-		Label: modelarts.DataUrl,
-		Value: dataPath,
-	})
+	existDeviceTarget := false
 	if len(params) != 0 {
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
@@ -1014,6 +1006,9 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		}
 
 		for _, parameter := range parameters.Parameter {
+			if parameter.Label == modelarts.DeviceTarget {
+				existDeviceTarget = true
+			}
 			if parameter.Label != modelarts.TrainUrl && parameter.Label != modelarts.DataUrl {
 				param = append(param, models.Parameter{
 					Label: parameter.Label,
@@ -1022,9 +1017,22 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 			}
 		}
 	}
+	if !existDeviceTarget {
+		param = append(param, models.Parameter{
+			Label: modelarts.DeviceTarget,
+			Value: modelarts.Ascend,
+		})
+	}
 
 	//save param config
 	if isSaveParam == "on" {
+		saveparams := append(param, models.Parameter{
+			Label: modelarts.TrainUrl,
+			Value: outputObsPath,
+		}, models.Parameter{
+			Label: modelarts.DataUrl,
+			Value: dataPath,
+		})
 		if form.ParameterTemplateName == "" {
 			log.Error("ParameterTemplateName is empty")
 			trainJobNewDataPrepare(ctx)
@@ -1046,7 +1054,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 			EngineID:      int64(engineID),
 			LogUrl:        logObsPath,
 			PoolID:        poolID,
-			Parameter:     param,
+			Parameter:     saveparams,
 		})
 
 		if err != nil {
@@ -1072,7 +1080,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		LogUrl:            logObsPath,
 		PoolID:            poolID,
 		Uuid:              uuid,
-		Parameters:        parameters.Parameter,
+		Parameters:        param,
 		CommitID:          commitID,
 		IsLatestVersion:   isLatestVersion,
 		BranchName:        branch_name,
@@ -1208,13 +1216,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 
 	var parameters models.Parameters
 	param := make([]models.Parameter, 0)
-	param = append(param, models.Parameter{
-		Label: modelarts.TrainUrl,
-		Value: outputObsPath,
-	}, models.Parameter{
-		Label: modelarts.DataUrl,
-		Value: dataPath,
-	})
+	existDeviceTarget := true
 	if len(params) != 0 {
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
@@ -1223,8 +1225,10 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 			ctx.RenderWithErr("运行参数错误", tplModelArtsTrainJobVersionNew, &form)
 			return
 		}
-
 		for _, parameter := range parameters.Parameter {
+			if parameter.Label == modelarts.DeviceTarget {
+				existDeviceTarget = true
+			}
 			if parameter.Label != modelarts.TrainUrl && parameter.Label != modelarts.DataUrl {
 				param = append(param, models.Parameter{
 					Label: parameter.Label,
@@ -1233,9 +1237,22 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 			}
 		}
 	}
+	if !existDeviceTarget {
+		param = append(param, models.Parameter{
+			Label: modelarts.DeviceTarget,
+			Value: modelarts.Ascend,
+		})
+	}
 
 	//save param config
 	if isSaveParam == "on" {
+		saveparams := append(param, models.Parameter{
+			Label: modelarts.TrainUrl,
+			Value: outputObsPath,
+		}, models.Parameter{
+			Label: modelarts.DataUrl,
+			Value: dataPath,
+		})
 		if form.ParameterTemplateName == "" {
 			log.Error("ParameterTemplateName is empty")
 			versionErrorDataPrepare(ctx, form)
@@ -1257,7 +1274,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 			EngineID:      int64(engineID),
 			LogUrl:        logObsPath,
 			PoolID:        poolID,
-			Parameter:     parameters.Parameter,
+			Parameter:     saveparams,
 		})
 
 		if err != nil {
@@ -1268,12 +1285,6 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 		}
 	}
 
-	if err != nil {
-		log.Error("getFlavorNameByEngineID(%s) failed:%v", engineID, err.Error())
-		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobVersionNew, &form)
-		return
-	}
-
 	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, PreVersionName)
 	if err != nil {
 		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", jobID, err.Error())
@@ -1297,7 +1308,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 		PoolID:            poolID,
 		Uuid:              uuid,
 		Params:            form.Params,
-		Parameters:        parameters.Parameter,
+		Parameters:        param,
 		PreVersionId:      task.VersionID,
 		CommitID:          commitID,
 		BranchName:        branch_name,
@@ -1824,7 +1835,6 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		return
 	}
 
-	//todo: del local code?
 	var parameters models.Parameters
 	param := make([]models.Parameter, 0)
 	param = append(param, models.Parameter{
@@ -1834,6 +1844,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		Label: modelarts.CkptUrl,
 		Value: "s3:/" + ckptUrl,
 	})
+	existDeviceTarget := false
 	if len(params) != 0 {
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
@@ -1844,6 +1855,9 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		}
 
 		for _, parameter := range parameters.Parameter {
+			if parameter.Label == modelarts.DeviceTarget {
+				existDeviceTarget = true
+			}
 			if parameter.Label != modelarts.TrainUrl && parameter.Label != modelarts.DataUrl {
 				param = append(param, models.Parameter{
 					Label: parameter.Label,
@@ -1852,6 +1866,12 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 			}
 		}
 	}
+	if !existDeviceTarget {
+		param = append(param, models.Parameter{
+			Label: modelarts.DeviceTarget,
+			Value: modelarts.Ascend,
+		})
+	}
 
 	req := &modelarts.GenerateInferenceJobReq{
 		JobName:           jobName,

templates/repo/cloudbrain/benchmark/index.tmpl

@@ -155,7 +155,7 @@
                                             {{end}}
                                         </form>
                                         <a class="ui basic button {{if $.IsSigned}} blue{{else}} disabled{{end}}" href="{{$.RepoLink}}/cloudbrain/{{.Cloudbrain.ID}}/rate" target="_blank">
-                                                        {{$.i18n.Tr "repo.stop"}}
+                                                        {{$.i18n.Tr "repo.score"}}
                                         </a>
 
                                       <!-- 删除任务 -->