From e2740b5148553ce82baf6d1ebd5a6918a161f71c Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 11 Nov 2021 11:30:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=95=B0=E5=88=9D=E5=A7=8B=E5=8C=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 8 ++++---- modules/modelarts/modelarts.go | 3 +++ routers/repo/modelarts.go | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 366ba74e4..f653f6e1e 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -73,7 +73,7 @@ type Cloudbrain struct { VersionName string `xorm:"INDEX"` Uuid string DatasetName string - VersionCount int64 `xorm:"INDEX DEFAULT 1"` + VersionCount int `xorm:"INDEX DEFAULT 1"` IsLatestVersion string CommitID string FatherVersionName string @@ -971,7 +971,7 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { return cloudbrains, count, nil } -func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { +func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, error) { sess := x.NewSession() defer sess.Close() @@ -1034,7 +1034,7 @@ func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, } sess.Close() - return cloudbrains, count, nil + return cloudbrains, int(count), nil } func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) { @@ -1110,7 +1110,7 @@ func SetTrainJobStatusByJobID(jobID string, status string, duration int64, train return } -func SetVersionCountAndLatestVersionByJobIDAndVersionName(jobID string, versionName string, versionCount int64, isLatestVersion string) (err error) { +func SetVersionCountAndLatestVersionByJobIDAndVersionName(jobID string, versionName string, versionCount int, isLatestVersion string) (err error) { cb := &Cloudbrain{JobID: jobID, VersionName: versionName, VersionCount: versionCount, IsLatestVersion: isLatestVersion} _, err = x.Cols("version_Count", "is_latest_version").Where("cloudbrain.job_id=? AND cloudbrain.version_name=?", jobID, versionName).Update(cb) return diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 88378ab10..39601a600 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -49,6 +49,7 @@ const ( NotLatestVersion = "0" ComputeResource = "NPU" InitFatherVersionName = "V0001" + VersionCount = 1 SortByCreateTime = "create_time" ConfigTypeCustom = "custom" @@ -79,6 +80,7 @@ type GenerateTrainJobReq struct { BranchName string FatherVersionName string FlavorName string + VersionCount int } type GenerateTrainJobVersionReq struct { @@ -259,6 +261,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error Description: req.Description, WorkServerNumber: req.WorkServerNumber, FlavorName: req.FlavorName, + VersionCount: req.VersionCount, }) if err != nil { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 8e75c58a9..bf4a1f31f 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -715,6 +715,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) branch_name := form.BranchName isLatestVersion := modelarts.IsLatestVersion FlavorName := form.FlavorName + VersionCount := modelarts.VersionCount if err := paramCheckCreateTrainJob(form); err != nil { log.Error("paramCheckCreateTrainJob failed:(%v)", err) @@ -862,6 +863,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) Params: form.Params, FatherVersionName: modelarts.InitFatherVersionName, FlavorName: FlavorName, + VersionCount: VersionCount, } err = modelarts.GenerateTrainJob(ctx, req) From 4b970a1bddb3ecd9c990cb6d660d7592a31e6764 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 11 Nov 2021 15:40:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=90=AF=E5=8A=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/modelarts/modelarts.go | 6 ++++-- routers/repo/modelarts.go | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 39601a600..8db1c11bf 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -66,6 +66,7 @@ type GenerateTrainJobReq struct { Description string CodeObsPath string BootFile string + BootFileUrl string DataUrl string TrainUrl string FlavorCode string @@ -89,6 +90,7 @@ type GenerateTrainJobVersionReq struct { Description string CodeObsPath string BootFile string + BootFileUrl string DataUrl string TrainUrl string FlavorCode string @@ -210,7 +212,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error Config: models.Config{ WorkServerNum: req.WorkServerNumber, AppUrl: req.CodeObsPath, - BootFileUrl: req.BootFile, + BootFileUrl: req.BootFileUrl, DataUrl: req.DataUrl, EngineID: req.EngineID, TrainUrl: req.TrainUrl, @@ -278,7 +280,7 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobVersionR Config: models.TrainJobVersionConfig{ WorkServerNum: req.WorkServerNumber, AppUrl: req.CodeObsPath, - BootFileUrl: req.BootFile, + BootFileUrl: req.BootFileUrl, DataUrl: req.DataUrl, EngineID: req.EngineID, TrainUrl: req.TrainUrl, diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index bf4a1f31f..5ca28515e 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -848,7 +848,8 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) DataUrl: dataPath, Description: description, CodeObsPath: codeObsPath, - BootFile: codeObsPath + bootFile, + BootFileUrl: codeObsPath + bootFile, + BootFile: bootFile, TrainUrl: outputObsPath, FlavorCode: flavorCode, WorkServerNumber: workServerNumber, @@ -912,9 +913,6 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) { ctx.Data["PageIsTrainJob"] = true var jobID = ctx.Params(":jobid") - // var fatherVersionName = ctx.Query("versionName") - // jobID = "19373" - // versionName = "V0009" jobName := form.JobName uuid := form.Attachment @@ -1072,7 +1070,8 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ DataUrl: dataPath, Description: description, CodeObsPath: codeObsPath, - BootFile: codeObsPath + bootFile, + BootFileUrl: codeObsPath + bootFile, + BootFile: bootFile, TrainUrl: outputObsPath, FlavorCode: flavorCode, WorkServerNumber: workServerNumber,