diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 0f9cde079..5625ece95 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -53,7 +53,7 @@ type Cloudbrain struct { JobID string `xorm:"INDEX NOT NULL"` JobType string `xorm:"INDEX NOT NULL DEFAULT 'DEBUG'"` JobName string `xorm:"INDEX"` - Status string `xorm:"INDEX DEFAULT 'INIT'"` + Status string `xorm:"INDEX"` UserID int64 `xorm:"INDEX"` RepoID int64 `xorm:"INDEX"` SubTaskName string `xorm:"INDEX"` @@ -1124,7 +1124,7 @@ func UpdateJob(job *Cloudbrain) error { func updateJob(e Engine, job *Cloudbrain) error { var sess *xorm.Session - sess = e.Where("job_id = ?", job.JobID) + sess = e.Where("job_id = ? AND version_name=?", job.JobID, job.VersionName) _, err := sess.Cols("status", "train_job_duration", "container_id", "container_ip").Update(job) return err } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index d69f7a1b2..d07812105 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -997,19 +997,35 @@ func TrainJobShow(ctx *context.Context) { JobType: string(models.JobTypeTrain), JobID: jobID, }) - if err != nil { - ctx.ServerError("Cloudbrain", err) - return - } if err != nil { - log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error()) + log.Error("GetVersionListTasks(%s) failed:%v", jobID, err.Error()) ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobShow, nil) return } + //将运行参数转化为epoch_size = 3, device_target = Ascend的格式 + for i, _ := range VersionListTasks { + + var parameters models.Parameters + + err := json.Unmarshal([]byte(VersionListTasks[i].Parameters), ¶meters) + if err != nil { + log.Error("Failed to Unmarshal Parameters: %s (%v)", VersionListTasks[i].Parameters, err) + trainJobNewDataPrepare(ctx) + return + } + + if len(parameters.Parameter) > 0 { + paramTemp := "" + for _, Parameter := range parameters.Parameter { + param := Parameter.Label + " = " + Parameter.Value + ", " + paramTemp = paramTemp + param + } + VersionListTasks[i].Parameters = paramTemp[:len(paramTemp)-2] + } + } ctx.Data["jobID"] = jobID - // ctx.Data["result"] = result ctx.Data["version_list_task"] = VersionListTasks ctx.Data["version_list_count"] = VersionListCount ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 8ba8a8c60..2827894ed 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -244,7 +244,7 @@ td, th {
- 空白 + {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}