Browse Source

提交代码,解决日志显示问题。

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.22.10.1^2
zouap 3 years ago
parent
commit
7b3eb3182d
2 changed files with 30 additions and 16 deletions
  1. +30
    -15
      routers/api/v1/repo/cloudbrain.go
  2. +0
    -1
      routers/repo/aisafety.go

+ 30
- 15
routers/api/v1/repo/cloudbrain.go View File

@@ -393,19 +393,20 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
return
}
if job.JobType == string(models.JobTypeModelSafety) {
if job.Type == models.TypeCloudBrainOne {
result, err := cloudbrain.GetJob(job.JobID)
existStr := ""
if err == nil && result != nil {
jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
taskRoles := jobRes.TaskRoles
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
existStr = taskRes.TaskStatuses[0].ExitDiagnostics
}
ctx.Data["existStr"] = existStr
log.Info("existStr=" + existStr)
CloudbrainGetLog(ctx)
} else if job.Type == models.TypeCloudBrainTwo {
// if job.Type == models.TypeCloudBrainOne {
// // result, err := cloudbrain.GetJob(job.JobID)
// // existStr := ""
// // if err == nil && result != nil {
// // jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
// // taskRoles := jobRes.TaskRoles
// // taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
// // existStr = taskRes.TaskStatuses[0].ExitDiagnostics
// // }
// // ctx.Data["existStr"] = existStr
// // log.Info("existStr=" + existStr)
// // CloudbrainGetLog(ctx)
// } else
if job.Type == models.TypeCloudBrainTwo {
//TrainJobForModelConvertGetLog(ctx)
var baseLine = ctx.Query("base_line")
var order = ctx.Query("order")
@@ -540,8 +541,22 @@ func CloudbrainGetLog(ctx *context.APIContext) {
return
}
if job.JobType == string(models.JobTypeModelSafety) {
ModelSafetyGetLog(ctx)
return
if job.Type == models.TypeCloudBrainOne {
result, err := cloudbrain.GetJob(job.JobID)
existStr := ""
if err == nil && result != nil {
jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
taskRoles := jobRes.TaskRoles
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
existStr = taskRes.TaskStatuses[0].ExitDiagnostics
}
ctx.Data["existStr"] = existStr
log.Info("existStr=" + existStr)
} else {
ModelSafetyGetLog(ctx)
return
}

}

lines := ctx.QueryInt("lines")


+ 0
- 1
routers/repo/aisafety.go View File

@@ -535,7 +535,6 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
} else {
log.Info("The GPU WaitCount not get")
}

ctx.HTML(200, tplModelSafetyTestCreateGpu)
}



Loading…
Cancel
Save