Browse Source

update

tags/v1.22.1.2
liuzx 3 years ago
parent
commit
f188675916
2 changed files with 15 additions and 11 deletions
  1. +3
    -3
      modules/modelarts/modelarts.go
  2. +12
    -8
      routers/repo/modelarts.go

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

@@ -47,12 +47,12 @@ const (
TrainUrl = "train_url"
DataUrl = "data_url"
ResultUrl = "result_url"
CkptName = "ckptName"
CkptName = "ckpt_name"
PerPage = 10
IsLatestVersion = "1"
NotLatestVersion = "0"
DebugType = -1
VersionCount = 1
DebugType = -1
VersionCount = 1

SortByCreateTime = "create_time"
ConfigTypeCustom = "custom"


+ 12
- 8
routers/repo/modelarts.go View File

@@ -1573,7 +1573,9 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
FlavorName := form.FlavorName
EngineName := form.EngineName
trainUrl := form.TrainUrl

modelName := form.ModelName
modelVersion := form.ModelVersion
ckptName := form.CkptName

count, err := models.GetCloudbrainTrainJobCountByUserID(ctx.User.ID)
if err != nil {
@@ -1601,13 +1603,13 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
_, err = ioutil.ReadDir(codeLocalPath)
if err == nil {
os.RemoveAll(codeLocalPath)
// }
} else {
log.Error("创建任务失败,原代码还未删除,请稍后重试!: %s (%v)", repo.FullName(), err)
inferenceJobErrorNewDataPrepare(ctx, form)
ctx.RenderWithErr("创建任务失败,原代码还未删除,请稍后重试!", tplModelArtsInferenceJobNew, &form)
return
}
// } else {
// log.Error("创建任务失败,原代码还未删除,请稍后重试!: %s (%v)", repo.FullName(), err)
// inferenceJobErrorNewDataPrepare(ctx, form)
// ctx.RenderWithErr("创建任务失败,原代码还未删除,请稍后重试!", tplModelArtsInferenceJobNew, &form)
// return
// }
// os.RemoveAll(codeLocalPath)

gitRepo, _ := git.OpenRepository(repo.RepoPath())
@@ -1655,7 +1657,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
Value: "s3:/" + resultObsPath,
}, models.Parameter{
Label: modelarts.CkptName,
Value: form.CkptName,
Value: ckptName,
})
if len(params) != 0 {
err := json.Unmarshal([]byte(params), &parameters)
@@ -1696,6 +1698,8 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
Params: form.Params,
FlavorName: FlavorName,
EngineName: EngineName,
ModelName: modelName,
ModelVersion: modelVersion,
}

//将params转换Parameters.Parameter,出错时返回给前端


Loading…
Cancel
Save