diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 628e1f776..48e7ece47 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -662,14 +662,35 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
if cloudbrain.TrainResourceSpecs == nil {
json.Unmarshal([]byte(setting.TrainResourceSpecs), &cloudbrain.TrainResourceSpecs)
}
+ hasSpec := false
for _, tmp := range cloudbrain.TrainResourceSpecs.ResourceSpec {
if tmp.Id == task.ResourceSpecId {
+ hasSpec = true
ctx.Data["GpuNum"] = tmp.GpuNum
ctx.Data["CpuNum"] = tmp.CpuNum
ctx.Data["MemMiB"] = tmp.MemMiB
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) {
if cloudbrain.InferenceResourceSpecs == nil {
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
}
}
+ 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) {
if inferenceGpuInfos == nil {
json.Unmarshal([]byte(setting.InferenceGpuTypes), &inferenceGpuInfos)
diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl
index 909cde468..00ad25644 100644
--- a/templates/repo/cloudbrain/inference/show.tmpl
+++ b/templates/repo/cloudbrain/inference/show.tmpl
@@ -317,9 +317,9 @@
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
- {{else}}
- {{TimeSinceUnix1 .CreatedUnix}}
- {{end}}
+ {{else}}
+ --
+ {{end}}
diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index da7402eb0..20e5cb55d 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -326,8 +326,13 @@
|
- {{TimeSinceUnix1 .CreatedUnix}}
+
+ {{if not (eq .StartTime 0)}}
+ {{TimeSinceUnix1 .StartTime}}
+ {{else}}
+ --
+ {{end}}
+
|
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 0572e9de1..5d4321736 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -345,7 +345,7 @@
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
{{else}}
- {{TimeSinceUnix1 .CreatedUnix}}
+ --
{{end}}
diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl
index 99deee551..14bb5cf24 100644
--- a/templates/repo/modelarts/inferencejob/show.tmpl
+++ b/templates/repo/modelarts/inferencejob/show.tmpl
@@ -266,9 +266,9 @@ td, th {
{{if not (eq .StartTime 0)}}
{{TimeSinceUnix1 .StartTime}}
- {{else}}
- {{TimeSinceUnix1 .CreatedUnix}}
- {{end}}
+ {{else}}
+ --
+ {{end}}
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl
index 6eb93b509..7d49ace86 100755
--- a/templates/repo/modelarts/notebook/show.tmpl
+++ b/templates/repo/modelarts/notebook/show.tmpl
@@ -407,7 +407,7 @@
-
+
|
{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
|
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 794e42457..7a727cf4c 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -292,11 +292,8 @@
- {{if not (eq .Cloudbrain.StartTime 0)}}
- {{TimeSinceUnix1 .Cloudbrain.StartTime}}
- {{else}}
{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
- {{end}}
+
{{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}}
@@ -380,7 +377,7 @@
{{if not (eq .Cloudbrain.StartTime 0)}}
{{TimeSinceUnix1 .Cloudbrain.StartTime}}
{{else}}
- {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
+ --
{{end}}