Browse Source

del error

tags/v1.22.1.3
lewis 3 years ago
parent
commit
11e19e3fcf
2 changed files with 25 additions and 15 deletions
  1. +24
    -14
      routers/repo/cloudbrain.go
  2. +1
    -1
      routers/routes/routes.go

+ 24
- 14
routers/repo/cloudbrain.go View File

@@ -33,7 +33,7 @@ const (
tplCloudBrainShowModels base.TplName = "repo/cloudbrain/models/index" tplCloudBrainShowModels base.TplName = "repo/cloudbrain/models/index"


tplCloudBrainBenchmarkIndex base.TplName = "repo/cloudbrain/benchmark/index" tplCloudBrainBenchmarkIndex base.TplName = "repo/cloudbrain/benchmark/index"
tplCloudBrainBenchmarkNew base.TplName = "repo/cloudbrain/benchmark/new"
tplCloudBrainBenchmarkNew base.TplName = "repo/cloudbrain/benchmark/new"
) )


var ( var (
@@ -950,8 +950,8 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
Page: page, Page: page,
PageSize: setting.UI.IssuePagingNum, PageSize: setting.UI.IssuePagingNum,
}, },
RepoID: repo.ID,
Type: models.TypeCloudBrainOne,
RepoID: repo.ID,
Type: models.TypeCloudBrainOne,
JobTypes: jobTypes, JobTypes: jobTypes,
}) })
if err != nil { if err != nil {
@@ -979,7 +979,6 @@ func GetChildTypes(ctx *context.Context) {
resultCode := "-1" resultCode := "-1"
errMsg := "" errMsg := ""
childTypes := "" childTypes := ""
//


for { for {
if benchmarkTypes == nil { if benchmarkTypes == nil {
@@ -991,11 +990,17 @@ func GetChildTypes(ctx *context.Context) {
} }


var isExist bool var isExist bool

for id, _ := range benchmarkTypes.BenchmarkType {
for id, benchmarkType := range benchmarkTypes.BenchmarkType {
if id == benchmarkTypeID { if id == benchmarkTypeID {
isExist = true isExist = true
//childTypesInfo = benchmarkType.Second
temp, err := json.Marshal(benchmarkType.Second)
if err != nil {
log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", setting.BenchmarkTypes, err, ctx.Data["MsgID"])
errMsg = "system error"
break
}
childTypes = string(temp)
resultCode = "0"
break break
} }
} }
@@ -1012,7 +1017,7 @@ func GetChildTypes(ctx *context.Context) {
ctx.JSON(200, map[string]string{ ctx.JSON(200, map[string]string{
"result_code": resultCode, "result_code": resultCode,
"error_msg": errMsg, "error_msg": errMsg,
"child_types": childTypes,
"child_types": childTypes,
}) })
} }


@@ -1025,6 +1030,10 @@ func CloudBrainBenchmarkNew(ctx *context.Context) {
ctx.HTML(200, tplCloudBrainBenchmarkNew) ctx.HTML(200, tplCloudBrainBenchmarkNew)
} }


func getBenchmarkAttachment() error {
return nil
}

func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
ctx.Data["PageIsCloudBrain"] = true ctx.Data["PageIsCloudBrain"] = true
jobName := form.JobName jobName := form.JobName
@@ -1072,6 +1081,7 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF
} }
} }
repo := ctx.Repo.Repository repo := ctx.Repo.Repository
os.RemoveAll(codePath)
if err := downloadCode(repo, codePath); err != nil { if err := downloadCode(repo, codePath); err != nil {
log.Error("system error, %v", err, ctx.Data["MsgID"]) log.Error("system error, %v", err, ctx.Data["MsgID"])
cloudBrainNewDataPrepare(ctx) cloudBrainNewDataPrepare(ctx)
@@ -1096,16 +1106,16 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF


if err := downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BenchmarkName, benchmarkPath, form.BenchmarkCategory, gpuType); err != nil { if err := downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BenchmarkName, benchmarkPath, form.BenchmarkCategory, gpuType); err != nil {
log.Error("system error, %v", err, ctx.Data["MsgID"]) log.Error("system error, %v", err, ctx.Data["MsgID"])
cloudBrainNewDataPrepare(ctx)
ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
return
//cloudBrainNewDataPrepare(ctx)
//ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
//return
} }


if err := uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/"); err != nil { if err := uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/"); err != nil {
log.Error("system error, %v", err, ctx.Data["MsgID"]) log.Error("system error, %v", err, ctx.Data["MsgID"])
cloudBrainNewDataPrepare(ctx)
ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
return
//cloudBrainNewDataPrepare(ctx)
//ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
//return
} }


err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"), err = cloudbrain.GenerateTask(ctx, jobName, image, command, uuid, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),


+ 1
- 1
routers/routes/routes.go View File

@@ -990,7 +990,7 @@ func RegisterRoutes(m *macaron.Macaron) {
}) })
m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew) m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate) m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
m.Get("/get_child_types", reqRepoCloudBrainWriter, repo.GetChildTypes)
m.Get("/get_child_types", repo.GetChildTypes)
}) })
}, context.RepoRef()) }, context.RepoRef())
m.Group("/modelmanage", func() { m.Group("/modelmanage", func() {


Loading…
Cancel
Save