Browse Source

#2225

update
tags/v1.22.9.2^2
chenyifan01 3 years ago
parent
commit
097c76d7f1
3 changed files with 22 additions and 20 deletions
  1. +8
    -17
      models/action.go
  2. +6
    -0
      models/action_list.go
  3. +8
    -3
      models/cloudbrain.go

+ 8
- 17
models/action.go View File

@@ -60,23 +60,14 @@ const (
ActionCreateGPUTrainTask //31
ActionCreateGrampusNPUTrainTask //32
ActionCreateGrampusGPUTrainTask //33
ActionUploadAttachment //24
ActionCreateDebugGPUTask //25
ActionCreateDebugNPUTask //26
ActionCreateTrainTask //27
ActionCreateInferenceTask // 28
ActionCreateBenchMarkTask //29
ActionCreateNewModelTask //30
ActionCreateGPUTrainTask //31

ActionBindWechat //32issue_assignees
ActionCreateCloudbrainTask //33
ActionDatasetRecommended //34
ActionCreateImage //35
ActionImageRecommend //36
ActionChangeUserAvatar //37
ActionPushCommits //38
ActionForkRepo //39
ActionBindWechat //34
ActionCreateCloudbrainTask //35
ActionDatasetRecommended //36
ActionCreateImage //37
ActionImageRecommend //38
ActionChangeUserAvatar //39
ActionPushCommits //40
ActionForkRepo //41

)



+ 6
- 0
models/action_list.go View File

@@ -29,6 +29,9 @@ func (actions ActionList) loadUsers(e Engine) ([]*User, error) {

userIDs := actions.getUserIDs()
userMaps := make(map[int64]*User, len(userIDs))
if len(userIDs) == 0 {
return make([]*User, 0), nil
}
err := e.
In("id", userIDs).
Find(&userMaps)
@@ -64,6 +67,9 @@ func (actions ActionList) loadRepositories(e Engine) ([]*Repository, error) {

repoIDs := actions.getRepoIDs()
repoMaps := make(map[int64]*Repository, len(repoIDs))
if len(repoIDs) == 0 {
return make([]*Repository, 0), nil
}
err := e.
In("id", repoIDs).
Find(&repoMaps)


+ 8
- 3
models/cloudbrain.go View File

@@ -188,6 +188,7 @@ type CloudbrainShow struct {
Duration string
ResourceSpec *ResourceAndFlavor
ComputeResource string
AiCenter string
}

type CloudbrainShow4Action struct {
@@ -199,9 +200,9 @@ type CloudbrainShow4Action struct {
}

func (task *Cloudbrain) ToShow() *CloudbrainShow {
return &CloudbrainShow{
ID: task.ID,
RepoFullName: task.Repo.FullName(),
c := &CloudbrainShow{
ID: task.ID,
JobType: task.JobType,
Type: task.Type,
DisplayJobName: task.DisplayJobName,
@@ -209,6 +210,10 @@ func (task *Cloudbrain) ToShow() *CloudbrainShow {
ResourceSpec: GetCloudbrainResourceSpec(task.JobType, task.Type, task.ResourceSpecId, task.FlavorCode),
ComputeResource: task.ComputeResource,
}
if task.Repo != nil {
c.RepoFullName = task.Repo.FullName()
}
return c
}

func (task *Cloudbrain) ComputeAndSetDuration() {


Loading…
Cancel
Save