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

fix issue

pull/2584/head
zhoupzh 2 years ago
parent
11ce61f1d3
commit
2ac84599ca
5 changed files with 201 additions and 89 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      options/locale/locale_en-US.ini
  2. +3
    -0
      options/locale/locale_zh-CN.ini
  3. +111
    -48
      templates/admin/cloudbrain/list.tmpl
  4. +1
    -1
      templates/admin/cloudbrain/search_dashboard.tmpl
  5. +83
    -40
      templates/user/dashboard/cloudbrains.tmpl

+ 3
- 0
options/locale/locale_en-US.ini View File

@@ -1098,6 +1098,9 @@ modelarts.createtime=CreateTime
modelarts.version_nums = Version Nums modelarts.version_nums = Version Nums
modelarts.version = Version modelarts.version = Version
modelarts.computing_resources=compute Resources modelarts.computing_resources=compute Resources
modelarts.ai_center=Ai Center
modelarts.card_type=Card Type
modelarts.cluster=Cluster
modelarts.notebook=Debug Task modelarts.notebook=Debug Task
modelarts.train_job=Train Task modelarts.train_job=Train Task
modelarts.train_job.new_debug= New Debug Task modelarts.train_job.new_debug= New Debug Task


+ 3
- 0
options/locale/locale_zh-CN.ini View File

@@ -1108,6 +1108,9 @@ modelarts.deletetime=删除时间
modelarts.version_nums=版本数 modelarts.version_nums=版本数
modelarts.version=版本 modelarts.version=版本
modelarts.computing_resources=计算资源 modelarts.computing_resources=计算资源
modelarts.ai_center=智算中心
modelarts.card_type=卡类型
modelarts.cluster=集群
modelarts.notebook=调试任务 modelarts.notebook=调试任务
modelarts.train_job=训练任务 modelarts.train_job=训练任务
modelarts.train_job.new_debug=新建调试任务 modelarts.train_job.new_debug=新建调试任务


+ 111
- 48
templates/admin/cloudbrain/list.tmpl View File

@@ -18,7 +18,7 @@
data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}" data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}"
data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div> data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div>
{{template "admin/navbar" .}} {{template "admin/navbar" .}}
<div class="ui container" style="width: 80%;">
<div class="ui container" style="width: 95%;">
{{template "base/alert" .}} {{template "base/alert" .}}
<div class="ui grid"> <div class="ui grid">
<div class="row" style="border: 1px solid #d4d4d5;margin-top: 15px;padding-top: 0;"> <div class="row" style="border: 1px solid #d4d4d5;margin-top: 15px;padding-top: 0;">
@@ -34,34 +34,46 @@
<!-- 表头 --> <!-- 表头 -->
<div class="ui grid stackable" style="background: #f0f0f0;;"> <div class="ui grid stackable" style="background: #f0f0f0;;">
<div class="row"> <div class="row">
<div class="two wide column nowrap">
<span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task"}}</span>
<div class="two wide column nowrap" style="width:10% !important;">
<span>{{$.i18n.Tr "repo.cloudbrain_task"}}</span>
</div> </div>
<div class="one wide column text center nowrap">
<span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
<!-- 集群 -->
<div class="one wide column text center nowrap" style="width:6% !important;">
<span>{{$.i18n.Tr "repo.modelarts.cluster"}}</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 10% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span>{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
</div>
<div class="two wide column text center nowrap" style="width: 6% !important;">
<span>{{$.i18n.Tr "repo.modelarts.status"}}</span> <span>{{$.i18n.Tr "repo.modelarts.status"}}</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 10% !important;">
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span> <span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span>
</div> </div>
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width: 5% !important;">
<span>{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}</span> <span>{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}</span>
</div> </div>
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width: 5% !important;">
<span>{{$.i18n.Tr "repo.modelarts.computing_resources"}}</span> <span>{{$.i18n.Tr "repo.modelarts.computing_resources"}}</span>
</div> </div>
<div class="one wide column text center nowrap">
<!-- 智算中心 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.ai_center"}}</span>
</div>
<!-- XPU类型 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.card_type"}}</span>
</div>
<div class="one wide column text center nowrap" style="width:4% !important;">
<span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span> <span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span>
</div> </div>
<div class="two wide column text center nowrap">
<div class="two wide column text center nowrap" style="width:10% !important;">
<span>{{$.i18n.Tr "repository"}}</span> <span>{{$.i18n.Tr "repository"}}</span>
</div> </div>
<div class="two wide column text center nowrap">
<div class="two wide column text center nowrap" style="width:10% !important;">
<span>{{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}</span> <span>{{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 17.5%!important;">
<div class="two wide column text center nowrap" style="width: 12%!important;">
<span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span> <span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
</div> </div>
</div> </div>
@@ -78,51 +90,52 @@
{{$JobID = .JobID}} {{$JobID = .JobID}}
{{end}} {{end}}
<!-- {{$JobID}} --> <!-- {{$JobID}} -->
<div class="two wide column nowrap">
<div class="two wide column nowrap" style="width:10% !important;">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain/{{$JobID}}{{else}}/modelarts/notebook/{{$JobID}}{{end}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain/{{$JobID}}{{else}}/modelarts/notebook/{{$JobID}}{{end}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}} {{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "INFERENCE"}} {{else if eq .JobType "INFERENCE"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "TRAIN"}} {{else if eq .JobType "TRAIN"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 0}}/cloudbrain{{else if eq .Cloudbrain.Type 1}}/modelarts{{else if eq .Cloudbrain.Type 2}}/grampus{{end}}/train-job/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 0}}/cloudbrain{{else if eq .Cloudbrain.Type 1}}/modelarts{{else if eq .Cloudbrain.Type 2}}/grampus{{end}}/train-job/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "BENCHMARK"}} {{else if eq .JobType "BENCHMARK"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{end}} {{end}}
</div> </div>
<!-- 任务类型 -->
<div class="one wide column text center nowrap">
<span style="font-size: 12px;">{{.JobType}} </span>
<!-- 集群 -->
<div class="one wide column text center nowrap" style="width:6% !important;">
<span
style="font-size: 12px;">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
</div> </div>
<!-- 任务状态 --> <!-- 任务状态 -->
<div class="two wide column text center nowrap" <div class="two wide column text center nowrap"
style="padding-left: 2.2rem !important; width: 10% !important;">
style="width: 6% !important;">
<span class="job-status" id="{{$JobID}}" <span class="job-status" id="{{$JobID}}"
data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}/modelarts/inference-job{{else if eq .JobType "TRAIN"}}/modelarts/train-job{{else if eq .JobType "BENCHMARK"}}/cloudbrain{{end}}' data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}/modelarts/inference-job{{else if eq .JobType "TRAIN"}}/modelarts/train-job{{else if eq .JobType "BENCHMARK"}}/cloudbrain{{end}}'
data-jobid="{{$JobID}}" data-version="{{.VersionName}}"> data-jobid="{{$JobID}}" data-version="{{.VersionName}}">
@@ -131,23 +144,39 @@
style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span> style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
</span> </span>
</div> </div>
<!-- 任务类型 -->
<div class="one wide column text center nowrap" style="width: 6% !important;">
<span style="font-size: 12px;">{{.JobType}} </span>
</div>
<!-- 任务创建时间 --> <!-- 任务创建时间 -->
<div class="two wide column text center nowrap" style="width: 10% !important;">
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span> class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>
</div> </div>
<!-- 任务运行时间 --> <!-- 任务运行时间 -->
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width: 5% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span> id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span>
</div> </div>
<!-- 计算资源 --> <!-- 计算资源 -->
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width: 5% !important;">
<span <span
style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span> style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span>
</div> </div>
<!-- 智算中心 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span
style="font-size: 12px;">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
</div>
<!-- XPU类型 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span style="font-size: 12px;" title="{{.CardType}}">
{{if .CardType}}{{.CardType}}{{else}}--{{end}}
</span>
</div>
<!-- 创建者 --> <!-- 创建者 -->
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width:4% !important;">
{{if .User.Name}} {{if .User.Name}}
<a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}"><img <a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}"><img
class="ui avatar image" src="{{.User.RelAvatarLink}}"></a> class="ui avatar image" src="{{.User.RelAvatarLink}}"></a>
@@ -157,16 +186,24 @@
{{end}} {{end}}
</div> </div>
<!-- 项目 --> <!-- 项目 -->
<div class="two wide column text center nowrap">
<div class="two wide column text center nowrap" style="width:10% !important;">
<a href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}" <a href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}"
title="{{.Repo.OwnerName}}/{{.Repo.Alias}}">{{.Repo.OwnerName}}/{{.Repo.Alias}}</a> title="{{.Repo.OwnerName}}/{{.Repo.Alias}}">{{.Repo.OwnerName}}/{{.Repo.Alias}}</a>
</div> </div>
<!-- 云脑侧名称 --> <!-- 云脑侧名称 -->
<div class="two wide column text center nowrap" <div class="two wide column text center nowrap"
style="overflow: hidden;text-overflow:ellipsis;">
<span class="fitted" title="{{.JobName}}">{{.JobName}}</span>
style="overflow: hidden;text-overflow:ellipsis;width:10% !important;">
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.JobName}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
<span class="fitted" title="{{.JobName}}">{{.JobName}}</span>
</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 17.5%!important;">
<div class="two wide column text center nowrap" style="width: 14%!important;">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<div class="ui compact buttons"> <div class="ui compact buttons">
<form id="debugAgainForm-{{$JobID}}"> <form id="debugAgainForm-{{$JobID}}">
@@ -235,36 +272,37 @@
<div class="ui grid stackable item"> <div class="ui grid stackable item">
<div class="row"> <div class="row">
<!-- 任务名 --> <!-- 任务名 -->
<div class="two wide column nowrap">
<div class="two wide column nowrap" style="width:10% !important;">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "INFERENCE"}} {{else if eq .JobType "INFERENCE"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "TRAIN"}} {{else if eq .JobType "TRAIN"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "BENCHMARK"}} {{else if eq .JobType "BENCHMARK"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{end}} {{end}}
</div> </div>
<!-- 任务类型 -->
<div class="one wide column text center nowrap">
<span style="font-size: 12px;">{{.JobType}} </span>
<!-- 集群 -->
<div class="one wide column text center nowrap" style="width:6% !important;">
<span
style="font-size: 12px;">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
</div> </div>
<!-- 任务状态 --> <!-- 任务状态 -->
<div class="two wide column text center nowrap" <div class="two wide column text center nowrap"
style="padding-left: 2.2rem !important; width: 10% !important;">
style="width: 6% !important;">
<span class="job-status" id="{{$JobID}}" data-jobid="{{$JobID}}" <span class="job-status" id="{{$JobID}}" data-jobid="{{$JobID}}"
data-version="{{.VersionName}}"> data-version="{{.VersionName}}">
<span><i id="{{$JobID}}-icon" style="vertical-align: middle;" <span><i id="{{$JobID}}-icon" style="vertical-align: middle;"
@@ -272,23 +310,39 @@
style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span> style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
</span> </span>
</div> </div>
<!-- 任务类型 -->
<div class="one wide column text center nowrap" style="width:6% !important;">
<span style="font-size: 12px;">{{.JobType}} </span>
</div>
<!-- 任务创建时间 --> <!-- 任务创建时间 -->
<div class="two wide column text center nowrap" style="width: 10% !important;">
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span> class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>
</div> </div>
<!-- 任务运行时间 --> <!-- 任务运行时间 -->
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width:5% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span> id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span>
</div> </div>
<!-- 计算资源 --> <!-- 计算资源 -->
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width:5% !important;">
<span <span
style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span> style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span>
</div> </div>
<!-- 智算中心 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span
style="font-size: 12px;">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
</div>
<!-- XPU类型 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span style="font-size: 12px;" title="{{.CardType}}">
{{if .CardType}}{{.CardType}}{{else}}--{{end}}
</span>
</div>
<!-- 创建者 --> <!-- 创建者 -->
<div class="one wide column text center nowrap">
<div class="one wide column text center nowrap" style="width:4% !important;">
{{if .User.Name}} {{if .User.Name}}
<a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}"><img <a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}"><img
class="ui avatar image" src="{{.User.RelAvatarLink}}"></a> class="ui avatar image" src="{{.User.RelAvatarLink}}"></a>
@@ -298,15 +352,24 @@
{{end}} {{end}}
</div> </div>
<!-- 项目 --> <!-- 项目 -->
<div class="two wide column text center nowrap">
<div class="two wide column text center nowrap" style="width:10% !important;">
<a href="" title="">--</a> <a href="" title="">--</a>
</div> </div>
<!-- 云脑侧名称 --> <!-- 云脑侧名称 -->
<div class="two wide column text center nowrap" <div class="two wide column text center nowrap"
style="overflow: hidden;text-overflow:ellipsis;">
<span class="fitted">{{.JobName}}</span>
style="overflow: hidden;text-overflow:ellipsis;width:10% !important;">
<span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer"
data-clipboard-text="{{.JobName}}"
data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
data-content="{{$.i18n.Tr "repo.copy_link"}}"
data-variation="inverted tiny"
>
<span class="fitted" title="{{.JobName}}">{{.JobName}}</span>
</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 17.5%!important;">
<div class="two wide column text center nowrap" style="width: 14%!important;">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<div class="ui compact buttons"> <div class="ui compact buttons">
<form id="debugAgainForm-{{$JobID}}"> <form id="debugAgainForm-{{$JobID}}">


+ 1
- 1
templates/admin/cloudbrain/search_dashboard.tmpl View File

@@ -15,7 +15,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui container" style="width: 80%;">
<div class="ui container" style="width: 90%;">
<div class="ui grid"> <div class="ui grid">
<div class="row"> <div class="row">
<div class="ui {{if $.PageIsUserCloudBrain}}sixteen{{else}}six{{end}} wide column" style="margin: 1rem 0;" id="userCloud"> <div class="ui {{if $.PageIsUserCloudBrain}}sixteen{{else}}six{{end}} wide column" style="margin: 1rem 0;" id="userCloud">


+ 83
- 40
templates/user/dashboard/cloudbrains.tmpl View File

@@ -20,7 +20,7 @@
data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}" data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}"
data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div> data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div>
{{template "admin/cloudbrain/search_dashboard" .}} {{template "admin/cloudbrain/search_dashboard" .}}
<div class="ui container" style="width: 80%;">
<div class="ui container" style="width: 90%;">
{{template "base/alert" .}} {{template "base/alert" .}}
<div class="ui grid"> <div class="ui grid">
<div class="row"> <div class="row">
@@ -30,30 +30,42 @@
<!-- 表头 --> <!-- 表头 -->
<div class="ui grid stackable" style="background: #f0f0f0;;"> <div class="ui grid stackable" style="background: #f0f0f0;;">
<div class="row"> <div class="row">
<div class="three wide column nowrap" style="width:15%">
<span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task"}}</span>
<div class="three wide column nowrap" style="width:12%!important">
<span>{{$.i18n.Tr "repo.cloudbrain_task"}}</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 11% !important;">
<!-- 集群 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.cluster"}}</span>
</div>
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.status"}}</span> <span>{{$.i18n.Tr "repo.modelarts.status"}}</span>
</div> </div>
<div class="one wide column text center nowrap" style="width:10%">
<span style="margin:0 6px">{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
<div class="one wide column text center nowrap" style="width:8% !important">
<span>{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
</div> </div>
<div class="two wide column text center nowrap" style="width: 11% !important;">
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span> <span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span>
</div> </div>
<div class="one wide column text center nowrap" style="width:8.5% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span>{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}</span> <span>{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}</span>
</div> </div>
<div class="one wide column text center nowrap" style="width:8.5% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span>{{$.i18n.Tr "repo.modelarts.computing_resources"}}</span> <span>{{$.i18n.Tr "repo.modelarts.computing_resources"}}</span>
</div> </div>

<div class="two wide column text center nowrap" style="width: 14.5%!important;">
<!-- 智算中心 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span>{{$.i18n.Tr "repo.modelarts.ai_center"}}</span>
</div>
<!-- XPU类型 -->
<div class="one wide column text center nowrap" style="width:10% !important;">
<span>{{$.i18n.Tr "repo.modelarts.card_type"}}</span>
</div>
<div class="two wide column text center nowrap" style="width: 11%!important;">
<span>{{$.i18n.Tr "repository"}}</span> <span>{{$.i18n.Tr "repository"}}</span>
</div> </div>


<div class="three wide column text center nowrap" style="width: 21.5%!important;">
<div class="three wide column text center nowrap" style="width: 15%!important;">
<span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span> <span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
</div> </div>
</div> </div>
@@ -70,48 +82,52 @@
{{$JobID = .JobID}} {{$JobID = .JobID}}
{{end}} {{end}}
<!-- {{$JobID}} --> <!-- {{$JobID}} -->
<div class="three wide column nowrap" style="width:15%">
<div class="three wide column nowrap" style="width:12% !important">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain/{{$JobID}}{{else}}/modelarts/notebook/{{$JobID}}{{end}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain/{{$JobID}}{{else}}/modelarts/notebook/{{$JobID}}{{end}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}} {{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "INFERENCE"}} {{else if eq .JobType "INFERENCE"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .Cloudbrain.Type 1}}modelarts{{else if eq .Cloudbrain.Type 0}}cloudbrain{{end}}/inference-job/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .Cloudbrain.Type 1}}modelarts{{else if eq .Cloudbrain.Type 0}}cloudbrain{{end}}/inference-job/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "TRAIN"}} {{else if eq .JobType "TRAIN"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .Cloudbrain.Type 1}}modelarts{{else if eq .Cloudbrain.Type 0}}cloudbrain{{else if eq .Cloudbrain.Type 2}}grampus{{end}}/train-job/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .Cloudbrain.Type 1}}modelarts{{else if eq .Cloudbrain.Type 0}}cloudbrain{{else if eq .Cloudbrain.Type 2}}grampus{{end}}/train-job/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "BENCHMARK"}} {{else if eq .JobType "BENCHMARK"}}
<a class="title" <a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{end}} {{end}}
</div> </div>

<!-- 集群 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span
style="font-size: 12px;">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
</div>
<!-- 任务状态 --> <!-- 任务状态 -->
<div class="two wide column text center nowrap" <div class="two wide column text center nowrap"
style="padding-left: 2.2rem !important; width: 11% !important;">
style="width: 8% !important;">
<span class="job-status" id="{{$JobID}}" <span class="job-status" id="{{$JobID}}"
data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts{{end}}/inference-job{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{else if eq .JobType "BENCHMARK"}}/cloudbrain{{end}}' data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts{{end}}/inference-job{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{else if eq .JobType "BENCHMARK"}}/cloudbrain{{end}}'
data-jobid="{{$JobID}}" data-version="{{.VersionName}}"> data-jobid="{{$JobID}}" data-version="{{.VersionName}}">
@@ -123,32 +139,44 @@
<!-- 任务类型 --> <!-- 任务类型 -->


{{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}} {{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}}
<div class="one wide column text center nowrap" style="width:10%">
<div class="one wide column text center nowrap" style="width:8% !important">
<span style="font-size: 12px;" title="{{.JobType}}">{{$JobType}}</span> <span style="font-size: 12px;" title="{{.JobType}}">{{$JobType}}</span>
</div> </div>
<!-- 任务创建时间 --> <!-- 任务创建时间 -->
<div class="two wide column text center nowrap" style="width: 11% !important;">
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span> class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>
</div> </div>
<!-- 任务运行时间 --> <!-- 任务运行时间 -->
<div class="one wide column text center nowrap" style="width:8.5% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span> id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span>
</div> </div>
<!-- 计算资源 --> <!-- 计算资源 -->
<div class="one wide column text center nowrap" style="width:8.5% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span <span
style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span> style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span>
</div> </div>
<!-- 智算中心 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span
style="font-size: 12px;">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
</div>
<!-- XPU类型 -->
<div class="one wide column text center nowrap" style="width:10% !important;">
<span style="font-size: 12px;" title="{{.CardType}}">
{{if .CardType}}{{.CardType}}{{else}}--{{end}}
</span>
</div>


<!-- 项目 --> <!-- 项目 -->
<div class="two wide column text center nowrap" style="width: 14.5%!important;">
<div class="two wide column text center nowrap" style="width: 11%!important;">
<a href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}" <a href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}"
title="{{.Repo.OwnerName}}/{{.Repo.Alias}}">{{.Repo.OwnerName}}/{{.Repo.Alias}}</a> title="{{.Repo.OwnerName}}/{{.Repo.Alias}}">{{.Repo.OwnerName}}/{{.Repo.Alias}}</a>
</div> </div>


<div class="three wide column text center nowrap" style="width: 21.5%!important;">
<div class="three wide column text center nowrap" style="width: 15%!important;">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<div class="ui compact buttons"> <div class="ui compact buttons">
<form id="debugAgainForm-{{$JobID}}"> <form id="debugAgainForm-{{$JobID}}">
@@ -226,33 +254,37 @@
<div class="ui grid stackable item"> <div class="ui grid stackable item">
<div class="row"> <div class="row">
<!-- 任务名 --> <!-- 任务名 -->
<div class="three wide column nowrap" style="width:15%">
<div class="three wide column nowrap" style="width:12% !important">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "INFERENCE"}} {{else if eq .JobType "INFERENCE"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "TRAIN"}} {{else if eq .JobType "TRAIN"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{else if eq .JobType "BENCHMARK"}} {{else if eq .JobType "BENCHMARK"}}
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;">
<a class="title" href="" title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
<span class="fitted" <span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span> style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a> </a>
{{end}} {{end}}
</div> </div>

<!-- 集群 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span
style="font-size: 12px;">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
</div>
<!-- 任务状态 --> <!-- 任务状态 -->
<div class="two wide column text center nowrap" <div class="two wide column text center nowrap"
style="padding-left: 2.2rem !important; width: 11% !important;">
style="padding-left: 2.2rem !important; width: 8% !important;">
<span class="job-status" id="{{$JobID}}" data-jobid="{{$JobID}}" <span class="job-status" id="{{$JobID}}" data-jobid="{{$JobID}}"
data-version="{{.VersionName}}"> data-version="{{.VersionName}}">
<span><i id="{{$JobID}}-icon" style="vertical-align: middle;" <span><i id="{{$JobID}}-icon" style="vertical-align: middle;"
@@ -262,31 +294,42 @@
</div> </div>
<!-- 任务类型 --> <!-- 任务类型 -->
{{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}} {{$JobType := $.i18n.Tr (printf "cloudbrain.%s" .JobType)}}
<div class="one wide column text center nowrap" style="width:10%">
<div class="one wide column text center nowrap" style="width:8%">
<span style="font-size: 12px;" title="{{.JobType}}">{{$JobType}}</span> <span style="font-size: 12px;" title="{{.JobType}}">{{$JobType}}</span>
</div> </div>
<!-- 任务创建时间 --> <!-- 任务创建时间 -->
<div class="two wide column text center nowrap" style="width: 11% !important;">
<div class="two wide column text center nowrap" style="width: 8% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span> class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>
</div> </div>
<!-- 任务运行时间 --> <!-- 任务运行时间 -->
<div class="one wide column text center nowrap" style="width:8.5% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span style="font-size: 12px;" <span style="font-size: 12px;"
id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span> id="duration-{{$JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span>
</div> </div>
<!-- 计算资源 --> <!-- 计算资源 -->
<div class="one wide column text center nowrap" style="width:8.5% !important;">
<div class="one wide column text center nowrap" style="width:6% !important;">
<span <span
style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span> style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span>
</div> </div>
<!-- 创建者 -->
<!-- 智算中心 -->
<div class="one wide column text center nowrap" style="width:8% !important;">
<span
style="font-size: 12px;">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
</div>
<!-- XPU类型 -->
<div class="one wide column text center nowrap" style="width:10% !important;">
<span style="font-size: 12px;" title="{{.CardType}}">
{{if .CardType}}{{.CardType}}{{else}}--{{end}}
</span>
</div>


<!-- 项目 --> <!-- 项目 -->
<div class="two wide column text center nowrap" style="width: 14.5%!important;">
<div class="two wide column text center nowrap" style="width: 11%!important;">
<a href="" title="">--</a> <a href="" title="">--</a>
</div> </div>
<div class="three wide column text center nowrap" style="width: 21.5%!important;">
<div class="three wide column text center nowrap" style="width: 15%!important;">
{{if eq .JobType "DEBUG"}} {{if eq .JobType "DEBUG"}}
<div class="ui compact buttons"> <div class="ui compact buttons">
<form id="debugAgainForm-{{$JobID}}"> <form id="debugAgainForm-{{$JobID}}">


Write Preview
Loading…
Cancel
Save