Browse Source

修改训练版本数初始化值

tags/v1.21.12.1
liuzx 4 years ago
parent
commit
e2740b5148
3 changed files with 9 additions and 4 deletions
  1. +4
    -4
      models/cloudbrain.go
  2. +3
    -0
      modules/modelarts/modelarts.go
  3. +2
    -0
      routers/repo/modelarts.go

+ 4
- 4
models/cloudbrain.go View File

@@ -73,7 +73,7 @@ type Cloudbrain struct {
VersionName string `xorm:"INDEX"` VersionName string `xorm:"INDEX"`
Uuid string Uuid string
DatasetName string DatasetName string
VersionCount int64 `xorm:"INDEX DEFAULT 1"`
VersionCount int `xorm:"INDEX DEFAULT 1"`
IsLatestVersion string IsLatestVersion string
CommitID string CommitID string
FatherVersionName string FatherVersionName string
@@ -971,7 +971,7 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
return cloudbrains, count, nil return cloudbrains, count, nil
} }


func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, error) {
sess := x.NewSession() sess := x.NewSession()
defer sess.Close() defer sess.Close()


@@ -1034,7 +1034,7 @@ func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64,
} }
sess.Close() sess.Close()


return cloudbrains, count, nil
return cloudbrains, int(count), nil
} }


func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) { func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) {
@@ -1110,7 +1110,7 @@ func SetTrainJobStatusByJobID(jobID string, status string, duration int64, train
return 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} 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) _, err = x.Cols("version_Count", "is_latest_version").Where("cloudbrain.job_id=? AND cloudbrain.version_name=?", jobID, versionName).Update(cb)
return return


+ 3
- 0
modules/modelarts/modelarts.go View File

@@ -49,6 +49,7 @@ const (
NotLatestVersion = "0" NotLatestVersion = "0"
ComputeResource = "NPU" ComputeResource = "NPU"
InitFatherVersionName = "V0001" InitFatherVersionName = "V0001"
VersionCount = 1


SortByCreateTime = "create_time" SortByCreateTime = "create_time"
ConfigTypeCustom = "custom" ConfigTypeCustom = "custom"
@@ -79,6 +80,7 @@ type GenerateTrainJobReq struct {
BranchName string BranchName string
FatherVersionName string FatherVersionName string
FlavorName string FlavorName string
VersionCount int
} }


type GenerateTrainJobVersionReq struct { type GenerateTrainJobVersionReq struct {
@@ -259,6 +261,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
Description: req.Description, Description: req.Description,
WorkServerNumber: req.WorkServerNumber, WorkServerNumber: req.WorkServerNumber,
FlavorName: req.FlavorName, FlavorName: req.FlavorName,
VersionCount: req.VersionCount,
}) })


if err != nil { if err != nil {


+ 2
- 0
routers/repo/modelarts.go View File

@@ -715,6 +715,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
branch_name := form.BranchName branch_name := form.BranchName
isLatestVersion := modelarts.IsLatestVersion isLatestVersion := modelarts.IsLatestVersion
FlavorName := form.FlavorName FlavorName := form.FlavorName
VersionCount := modelarts.VersionCount


if err := paramCheckCreateTrainJob(form); err != nil { if err := paramCheckCreateTrainJob(form); err != nil {
log.Error("paramCheckCreateTrainJob failed:(%v)", err) log.Error("paramCheckCreateTrainJob failed:(%v)", err)
@@ -862,6 +863,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
Params: form.Params, Params: form.Params,
FatherVersionName: modelarts.InitFatherVersionName, FatherVersionName: modelarts.InitFatherVersionName,
FlavorName: FlavorName, FlavorName: FlavorName,
VersionCount: VersionCount,
} }


err = modelarts.GenerateTrainJob(ctx, req) err = modelarts.GenerateTrainJob(ctx, req)


Loading…
Cancel
Save