Browse Source

point use

tags/v1.22.9.2^2
chenshihai 3 years ago
parent
commit
1c541adba0
19 changed files with 156 additions and 37 deletions
  1. +22
    -2
      templates/repo/cloudbrain/benchmark/new.tmpl
  2. +1
    -1
      templates/repo/cloudbrain/benchmark/show.tmpl
  3. +12
    -3
      templates/repo/cloudbrain/inference/new.tmpl
  4. +1
    -1
      templates/repo/cloudbrain/inference/show.tmpl
  5. +12
    -2
      templates/repo/cloudbrain/new.tmpl
  6. +1
    -1
      templates/repo/cloudbrain/show.tmpl
  7. +12
    -2
      templates/repo/cloudbrain/trainjob/new.tmpl
  8. +1
    -1
      templates/repo/cloudbrain/trainjob/show.tmpl
  9. +12
    -3
      templates/repo/grampus/trainjob/gpu/new.tmpl
  10. +12
    -3
      templates/repo/grampus/trainjob/npu/new.tmpl
  11. +1
    -1
      templates/repo/grampus/trainjob/show.tmpl
  12. +12
    -3
      templates/repo/modelarts/inferencejob/new.tmpl
  13. +1
    -1
      templates/repo/modelarts/inferencejob/show.tmpl
  14. +14
    -3
      templates/repo/modelarts/notebook/new.tmpl
  15. +1
    -1
      templates/repo/modelarts/notebook/show.tmpl
  16. +12
    -3
      templates/repo/modelarts/trainjob/new.tmpl
  17. +1
    -1
      templates/repo/modelarts/trainjob/show.tmpl
  18. +12
    -3
      templates/repo/modelarts/trainjob/version_new.tmpl
  19. +16
    -2
      web_src/js/standalone/specsuse.js

+ 22
- 2
templates/repo/cloudbrain/benchmark/new.tmpl View File

@@ -131,8 +131,18 @@
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
<select id="__specs__" class="ui search dropdown width48" <select id="__specs__" class="ui search dropdown width48"
placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
{{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
name="spec_id"> name="spec_id">
</select> </select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<div class="inline min_title field"> <div class="inline min_title field">
<label class="label-fix-width" style="font-weight: normal;"></label> <label class="label-fix-width" style="font-weight: normal;"></label>
@@ -231,8 +241,18 @@
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
<select id="__specs__" class="ui search dropdown width48" <select id="__specs__" class="ui search dropdown width48"
placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
{{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
name="spec_id"> name="spec_id">
</select> </select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>


<div class="inline min_title field required"> <div class="inline min_title field required">
@@ -366,8 +386,8 @@


;(function() { ;(function() {
var SPECS = {{ .benchmark_specs }}; var SPECS = {{ .benchmark_specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


+ 1
- 1
templates/repo/cloudbrain/benchmark/show.tmpl View File

@@ -575,7 +575,7 @@
<script> <script>
;(function() { ;(function() {
var SPEC = {{ $.Spec }}; var SPEC = {{ $.Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


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

@@ -254,8 +254,17 @@
</div>--> </div>-->
<div class="required min_title inline field"> <div class="required min_title inline field">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
<select id="__specs__" class="ui search dropdown width48" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" name="spec_id">
<select id="__specs__" class="ui search dropdown width48" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" name="spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}>
</select> </select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<!-- 表单操作 --> <!-- 表单操作 -->
<div class="inline min_title field"> <div class="inline min_title field">
@@ -518,8 +527,8 @@
}) })
;(function() { ;(function() {
var SPECS = {{ .inference_specs }}; var SPECS = {{ .inference_specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


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

@@ -618,7 +618,7 @@


;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


+ 12
- 2
templates/repo/cloudbrain/new.tmpl View File

@@ -146,8 +146,18 @@
<label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label> <label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
<select id="__specs__" class="ui search dropdown" <select id="__specs__" class="ui search dropdown"
placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
{{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
name="spec_id"> name="spec_id">
</select> </select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip" style="padding:0 5px;margin:6px 0;margin-left:265px;font-size:12px;width: 50%!important;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>


<div class="inline required field"> <div class="inline required field">
@@ -303,13 +313,13 @@


;(function() { ;(function() {
var SPECS = {{ .debug_specs }}; var SPECS = {{ .debug_specs }};
var showPoint = true;
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, { window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}}, memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}}, shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
});
});
})(); })();
</script> </script>

+ 1
- 1
templates/repo/cloudbrain/show.tmpl View File

@@ -595,7 +595,7 @@
} }
;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


+ 12
- 2
templates/repo/cloudbrain/trainjob/new.tmpl View File

@@ -259,8 +259,18 @@
<div class="required min_title inline field"> <div class="required min_title inline field">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
<select id="__specs__" class="ui dropdown width48" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" <select id="__specs__" class="ui dropdown width48" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}"
{{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
name="spec_id"> name="spec_id">
</select> </select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>


<div class="inline field" style="padding: 1rem 0;"> <div class="inline field" style="padding: 1rem 0;">
@@ -435,8 +445,8 @@
}) })
;(function() { ;(function() {
var SPECS = {{ .train_specs }}; var SPECS = {{ .train_specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


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

@@ -984,7 +984,7 @@


;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


+ 12
- 3
templates/repo/grampus/trainjob/gpu/new.tmpl View File

@@ -206,7 +206,16 @@
</div>--> </div>-->
<div class="required min_title inline field" id="flavor_name"> <div class="required min_title inline field" id="flavor_name">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
<select class="ui dropdown width48" id="__specs__" style='width:385px' name="spec_id"></select>
<select class="ui dropdown width48" id="__specs__" style='width:385px' name="spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}></select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>


<div class="inline min_title field"> <div class="inline min_title field">
@@ -386,8 +395,8 @@


;(function() { ;(function() {
var SPECS = {{ .Specs }}; var SPECS = {{ .Specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


+ 12
- 3
templates/repo/grampus/trainjob/npu/new.tmpl View File

@@ -218,7 +218,16 @@
</div>--> </div>-->
<div class="required min_title inline field" id="flavor_name"> <div class="required min_title inline field" id="flavor_name">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
<select class="ui dropdown width48" id="__specs__" style='width:385px' name="spec_id"></select>
<select class="ui dropdown width48" id="__specs__" style='width:385px' name="spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}></select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<div class="inline required min_title field"> <div class="inline required min_title field">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
@@ -407,8 +416,8 @@


;(function() { ;(function() {
var SPECS = {{ .Specs }}; var SPECS = {{ .Specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


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

@@ -633,7 +633,7 @@
<script> <script>
;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


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

@@ -275,7 +275,16 @@
</div>--> </div>-->
<div class="required min_title inline field" id="flaver_name"> <div class="required min_title inline field" id="flaver_name">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
<select class="ui dropdown width48" id="__specs__" name="spec_id"></select>
<select class="ui dropdown width48" id="__specs__" name="spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}></select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<!-- 计算节点 --> <!-- 计算节点 -->
<div class="inline required min_title field"> <div class="inline required min_title field">
@@ -542,8 +551,8 @@


;(function() { ;(function() {
var SPECS = {{ .Specs }}; var SPECS = {{ .Specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


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

@@ -534,7 +534,7 @@ $(document).ready(function(){
}) })
;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


+ 14
- 3
templates/repo/modelarts/notebook/new.tmpl View File

@@ -79,7 +79,18 @@
</div>--> </div>-->
<div class="inline required field"> <div class="inline required field">
<label>{{.i18n.Tr "cloudbrain.specification"}}</label> <label>{{.i18n.Tr "cloudbrain.specification"}}</label>
<select id="__specs__" class="ui search dropdown" placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' name="spec_id"></select>
<select id="__specs__" class="ui search dropdown"
{{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' name="spec_id"></select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip" style="padding:0 5px;margin:6px 0;margin-left:265px;font-size:12px;width: 50%!important;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<!--<div class="inline required field"> <!--<div class="inline required field">
<label>数据集存放路径</label> <label>数据集存放路径</label>
@@ -181,8 +192,8 @@


;(function() { ;(function() {
var SPECS = {{ .Specs }}; var SPECS = {{ .Specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


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

@@ -495,7 +495,7 @@


;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


+ 12
- 3
templates/repo/modelarts/trainjob/new.tmpl View File

@@ -283,7 +283,16 @@
</div>--> </div>-->
<div class="required inline min_title field" id="flaver_name"> <div class="required inline min_title field" id="flaver_name">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
<select class="ui dropdown width48" id="__specs__" name="spec_id"></select>
<select class="ui dropdown width48" id="__specs__" name="spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}></select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<div class="inline required min_title field"> <div class="inline required min_title field">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label> <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
@@ -533,8 +542,8 @@


;(function() { ;(function() {
var SPECS = {{ .Specs }}; var SPECS = {{ .Specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


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

@@ -405,7 +405,7 @@
<script> <script>
;(function() { ;(function() {
var SPEC = {{ .Spec }}; var SPEC = {{ .Spec }};
var showPoint = true;
var showPoint = false;
var specStr = window.renderSpecStr(SPEC, showPoint, { var specStr = window.renderSpecStr(SPEC, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},


+ 12
- 3
templates/repo/modelarts/trainjob/version_new.tmpl View File

@@ -228,7 +228,16 @@
</div>--> </div>-->
<div class="required unite min_title inline field" id="flaver_name"> <div class="required unite min_title inline field" id="flaver_name">
<label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label> <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.standard"}}</label>
<select id="__specs__" class="ui dropdown width81" style='width:385px' name="spec_id"></select>
<select id="__specs__" class="ui dropdown width80" style='width:385px' name="spec_id" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}></select>
{{if .CloudBrainPaySwitch}}
<div class="cloudbrain_resource_spec_blance_tip width80" style="padding:0 5px;margin:6px 0;margin-left:60px;font-size:12px;">
<span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
<span style="float:right;">
<i class="question circle icon link" data-position="right center" data-variation="mini"></i>
<a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
</span>
</div>
{{end}}
</div> </div>
<div class="inline required unite min_title field"> <div class="inline required unite min_title field">
<label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label> <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.amount_of_compute_node"}}</label>
@@ -531,8 +540,8 @@


;(function() { ;(function() {
var SPECS = {{ .Specs }}; var SPECS = {{ .Specs }};
var showPoint = true;
renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
free: {{$.i18n.Tr "cloudbrain.free"}}, free: {{$.i18n.Tr "cloudbrain.free"}},
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}}, point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},


+ 16
- 2
web_src/js/standalone/specsuse.js View File

@@ -9,7 +9,6 @@ window.getListValueWithKey = (list, key, k = 'k', v = 'v', defaultV = '') => {
}; };


window.renderSpecStr = (spec, showPoint, langObj) => { window.renderSpecStr = (spec, showPoint, langObj) => {
showPoint = false;
var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`; var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
var gpuMemStr = spec.GPUMemGiB != 0 ? `${langObj.gpu_memory}: ${spec.GPUMemGiB}GB, ` : ''; var gpuMemStr = spec.GPUMemGiB != 0 ? `${langObj.gpu_memory}: ${spec.GPUMemGiB}GB, ` : '';
var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${langObj.shared_memory}: ${spec.ShareMemGiB}GB` : ''; var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${langObj.shared_memory}: ${spec.ShareMemGiB}GB` : '';
@@ -21,9 +20,24 @@ window.renderSpecStr = (spec, showPoint, langObj) => {
window.renderSpecsSelect = (specsSel, data, showPoint, langObj) => { window.renderSpecsSelect = (specsSel, data, showPoint, langObj) => {
specsSel.empty(); specsSel.empty();
data = data || []; data = data || [];
showPoint = specsSel.attr('blance') ? true : false;
for (var i = 0, iLen = data.length; i < iLen; i++) { for (var i = 0, iLen = data.length; i < iLen; i++) {
var spec = data[i]; var spec = data[i];
var specStr = window.renderSpecStr(spec, showPoint, langObj); var specStr = window.renderSpecStr(spec, showPoint, langObj);
specsSel.append(`<option name="spec_id" value="${spec.ID}" queueCode="${spec.QueueCode}">${specStr}</option>`);
specsSel.append(`<option name="spec_id" value="${spec.ID}" queueCode="${spec.QueueCode}" unitprice="${spec.UnitPrice}">${specStr}</option>`);
}
if (showPoint) {
specsSel.on('change', function (e) {
var cloudbrain_resource_spec_blance_tip_el = $('.cloudbrain_resource_spec_blance_tip');
var blance = $(this).attr('blance');
var unitPrice = $(this).find('option:selected').attr('unitprice');
if (!blance || !unitPrice) return;
if (unitPrice == 0) {
cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').parent().hide();
} else {
var canUseTime = Number(blance) / Number(unitPrice);
cloudbrain_resource_spec_blance_tip_el.find('.can-use-time').text(canUseTime.toFixed(2)).parent().show();
}
}).trigger('change');
} }
} }

Loading…
Cancel
Save