wangwei
/
aiforge
Not watched
1
0
Fork 0
Code
Releases 128 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Merge branch 'V20220718' into fix-1956

tags/v1.22.7.2^2
ychao_1983 3 years ago
parent
9d42e312d7 9f201ff6c2
commit
cc9c98c80c
7 changed files with 47 additions and 15 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +30
    -0
      routers/repo/cloudbrain.go
  2. +3
    -3
      templates/repo/cloudbrain/inference/show.tmpl
  3. +7
    -2
      templates/repo/cloudbrain/trainjob/show.tmpl
  4. +1
    -1
      templates/repo/grampus/trainjob/show.tmpl
  5. +3
    -3
      templates/repo/modelarts/inferencejob/show.tmpl
  6. +1
    -1
      templates/repo/modelarts/notebook/show.tmpl
  7. +2
    -5
      templates/repo/modelarts/trainjob/show.tmpl

+ 30
- 0
routers/repo/cloudbrain.go View File

@@ -662,14 +662,35 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
if cloudbrain.TrainResourceSpecs == nil { if cloudbrain.TrainResourceSpecs == nil {
json.Unmarshal([]byte(setting.TrainResourceSpecs), &cloudbrain.TrainResourceSpecs) json.Unmarshal([]byte(setting.TrainResourceSpecs), &cloudbrain.TrainResourceSpecs)
} }
hasSpec := false
for _, tmp := range cloudbrain.TrainResourceSpecs.ResourceSpec { for _, tmp := range cloudbrain.TrainResourceSpecs.ResourceSpec {
if tmp.Id == task.ResourceSpecId { if tmp.Id == task.ResourceSpecId {
hasSpec = true
ctx.Data["GpuNum"] = tmp.GpuNum ctx.Data["GpuNum"] = tmp.GpuNum
ctx.Data["CpuNum"] = tmp.CpuNum ctx.Data["CpuNum"] = tmp.CpuNum
ctx.Data["MemMiB"] = tmp.MemMiB ctx.Data["MemMiB"] = tmp.MemMiB
ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
} }
} }

if !hasSpec && cloudbrain.SpecialPools != nil {
for _, specialPool := range cloudbrain.SpecialPools.Pools {

if specialPool.ResourceSpec != nil {

for _, spec := range specialPool.ResourceSpec {
if task.ResourceSpecId == spec.Id {
ctx.Data["GpuNum"] = spec.GpuNum
ctx.Data["CpuNum"] = spec.CpuNum
ctx.Data["MemMiB"] = spec.MemMiB
ctx.Data["ShareMemMiB"] = spec.ShareMemMiB
break
}
}
}
}
}

} else if task.JobType == string(models.JobTypeInference) { } else if task.JobType == string(models.JobTypeInference) {
if cloudbrain.InferenceResourceSpecs == nil { if cloudbrain.InferenceResourceSpecs == nil {
json.Unmarshal([]byte(setting.InferenceResourceSpecs), &cloudbrain.InferenceResourceSpecs) json.Unmarshal([]byte(setting.InferenceResourceSpecs), &cloudbrain.InferenceResourceSpecs)
@@ -710,6 +731,15 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
ctx.Data["resource_type"] = resourceType.Value ctx.Data["resource_type"] = resourceType.Value
} }
} }
for _, specialPool := range cloudbrain.SpecialPools.Pools {

for _, resourceType := range specialPool.Pool {
if resourceType.Queue == jobRes.Config.GpuType {
ctx.Data["resource_type"] = resourceType.Value
}
}
}

} else if task.JobType == string(models.JobTypeInference) { } else if task.JobType == string(models.JobTypeInference) {
if inferenceGpuInfos == nil { if inferenceGpuInfos == nil {
json.Unmarshal([]byte(setting.InferenceGpuTypes), &inferenceGpuInfos) json.Unmarshal([]byte(setting.InferenceGpuTypes), &inferenceGpuInfos)


+ 3
- 3
templates/repo/cloudbrain/inference/show.tmpl View File

@@ -317,9 +317,9 @@
<span style="font-size: 12px;" class=""> <span style="font-size: 12px;" class="">
{{if not (eq .StartTime 0)}} {{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}} {{TimeSinceUnix1 .StartTime}}
{{else}}
{{TimeSinceUnix1 .CreatedUnix}}
{{end}}
{{else}}
--
{{end}}
</span> </span>
</div> </div>
</td> </td>


+ 7
- 2
templates/repo/cloudbrain/trainjob/show.tmpl View File

@@ -326,8 +326,13 @@


<td class="ti-text-form-content"> <td class="ti-text-form-content">
<div class="text-span text-span-w"> <div class="text-span text-span-w">
<span style="font-size: 12px;"
class="">{{TimeSinceUnix1 .CreatedUnix}}</span>
<span style="font-size: 12px;">
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
{{else}}
--
{{end}}
</span>
</div> </div>
</td> </td>
</tr> </tr>


+ 1
- 1
templates/repo/grampus/trainjob/show.tmpl View File

@@ -345,7 +345,7 @@
{{if not (eq .StartTime 0)}} {{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}} {{TimeSinceUnix1 .StartTime}}
{{else}} {{else}}
{{TimeSinceUnix1 .CreatedUnix}}
--
{{end}}</span> {{end}}</span>
</div> </div>
</td> </td>


+ 3
- 3
templates/repo/modelarts/inferencejob/show.tmpl View File

@@ -266,9 +266,9 @@ td, th {
<span style="font-size: 12px;" class=""> <span style="font-size: 12px;" class="">
{{if not (eq .StartTime 0)}} {{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}} {{TimeSinceUnix1 .StartTime}}
{{else}}
{{TimeSinceUnix1 .CreatedUnix}}
{{end}}
{{else}}
--
{{end}}
</span> </span>
</div> </div>
</td> </td>


+ 1
- 1
templates/repo/modelarts/notebook/show.tmpl View File

@@ -407,7 +407,7 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="ti-no-ng-animate">
<tr class="ti-no-ng-animate">
<td class="ti-no-ng-animate ti-text-form-label text-width80"> <td class="ti-no-ng-animate ti-text-form-label text-width80">
{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
</td> </td>


+ 2
- 5
templates/repo/modelarts/trainjob/show.tmpl View File

@@ -292,11 +292,8 @@
<div class="ac-display-inblock title_text acc-margin-bottom"> <div class="ac-display-inblock title_text acc-margin-bottom">


<span class="cti-mgRight-sm"> <span class="cti-mgRight-sm">
{{if not (eq .Cloudbrain.StartTime 0)}}
{{TimeSinceUnix1 .Cloudbrain.StartTime}}
{{else}}
{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
{{end}}</span>
</span>
<span class="cti-mgRight-sm"> <span class="cti-mgRight-sm">
{{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}}</span> {{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}}</span>
<span class="cti-mgRight-sm"> <span class="cti-mgRight-sm">
@@ -380,7 +377,7 @@
{{if not (eq .Cloudbrain.StartTime 0)}} {{if not (eq .Cloudbrain.StartTime 0)}}
{{TimeSinceUnix1 .Cloudbrain.StartTime}} {{TimeSinceUnix1 .Cloudbrain.StartTime}}
{{else}} {{else}}
{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
--
{{end}}</span> {{end}}</span>
</div> </div>
</td> </td>


Write Preview
Loading…
Cancel
Save