Browse Source

show restart action

tags/v1.22.3.2^2
lewis 3 years ago
parent
commit
6dc72806a1
2 changed files with 12 additions and 8 deletions
  1. +9
    -7
      modules/cloudbrain/cloudbrain.go
  2. +3
    -1
      routers/repo/modelarts.go

+ 9
- 7
modules/cloudbrain/cloudbrain.go View File

@@ -21,7 +21,7 @@ const (
CodeMountPath = "/code" CodeMountPath = "/code"
DataSetMountPath = "/dataset" DataSetMountPath = "/dataset"
ModelMountPath = "/model" ModelMountPath = "/model"
LogFile = "log.txt"
LogFile = "log.txt"
BenchMarkMountPath = "/benchmark" BenchMarkMountPath = "/benchmark"
BenchMarkResourceID = 1 BenchMarkResourceID = 1
Snn4imagenetMountPath = "/snn4imagenet" Snn4imagenetMountPath = "/snn4imagenet"
@@ -291,16 +291,16 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command,
IsLatestVersion: "1", IsLatestVersion: "1",
VersionCount: versionCount, VersionCount: versionCount,
BranchName: branchName, BranchName: branchName,
BootFile: bootFile,
DatasetName: datasetName,
Parameters: params,
BootFile: bootFile,
DatasetName: datasetName,
Parameters: params,
}) })


if err != nil { if err != nil {
return err return err
} }


task, err := models.GetCloudbrainByName(jobName)
task, err := models.GetCloudbrainByJobID(jobID)
if err != nil { if err != nil {
log.Error("GetCloudbrainByName failed: %v", err.Error()) log.Error("GetCloudbrainByName failed: %v", err.Error())
return err return err
@@ -440,8 +440,10 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) e
return err return err
} }


idString := strconv.FormatInt(newTask.ID, 10)
*newID = idString
stringId := strconv.FormatInt(newTask.ID, 10)
*newID = stringId

notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, stringId, task.DisplayJobName, models.ActionCreateDebugGPUTask)


return nil return nil
} }

+ 3
- 1
routers/repo/modelarts.go View File

@@ -2,6 +2,7 @@ package repo


import ( import (
"archive/zip" "archive/zip"
"code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"encoding/json" "encoding/json"
"errors" "errors"
@@ -430,7 +431,7 @@ func NotebookManage(ctx *context.Context) {
Uuid: task.Uuid, Uuid: task.Uuid,
Image: task.Image, Image: task.Image,
ComputeResource: task.ComputeResource, ComputeResource: task.ComputeResource,
Description: task.Description,
Description: task.Description,
} }


err = models.RestartCloudbrain(task, newTask) err = models.RestartCloudbrain(task, newTask)
@@ -441,6 +442,7 @@ func NotebookManage(ctx *context.Context) {
break break
} }
ID = strconv.FormatInt(newTask.ID, 10) ID = strconv.FormatInt(newTask.ID, 10)
notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, ID, task.DisplayJobName, models.ActionCreateDebugNPUTask)
} else { } else {
task.Status = res.Status task.Status = res.Status
if task.EndTime == 0 && models.IsModelArtsDebugJobTerminal(task.Status) { if task.EndTime == 0 && models.IsModelArtsDebugJobTerminal(task.Status) {


Loading…
Cancel
Save