#4039 fix-3976

Merged
chenshihai merged 3 commits from fix-3976 into V20230425 1 year ago
  1. +1
    -1
      options/locale/locale_en-US.ini
  2. +1
    -0
      options/locale/locale_zh-CN.ini
  3. +1
    -0
      templates/repo/cloudbrain/benchmark/new.tmpl
  4. +1
    -0
      templates/repo/cloudbrain/benchmark/show.tmpl
  5. +1
    -0
      templates/repo/cloudbrain/inference/new.tmpl
  6. +1
    -0
      templates/repo/cloudbrain/inference/show.tmpl
  7. +1
    -0
      templates/repo/cloudbrain/new.tmpl
  8. +1
    -0
      templates/repo/cloudbrain/show.tmpl
  9. +1
    -0
      templates/repo/cloudbrain/trainjob/new.tmpl
  10. +1
    -0
      templates/repo/cloudbrain/trainjob/show.tmpl
  11. +1
    -0
      templates/repo/grampus/notebook/gcu/new.tmpl
  12. +1
    -0
      templates/repo/grampus/notebook/gpu/new.tmpl
  13. +1
    -0
      templates/repo/grampus/notebook/npu/new.tmpl
  14. +1
    -0
      templates/repo/grampus/notebook/show.tmpl
  15. +1
    -0
      templates/repo/grampus/trainjob/gcu/new.tmpl
  16. +1
    -0
      templates/repo/grampus/trainjob/gpu/new.tmpl
  17. +1
    -41
      templates/repo/grampus/trainjob/npu/new.tmpl
  18. +1
    -0
      templates/repo/grampus/trainjob/show.tmpl
  19. +1
    -0
      templates/repo/modelarts/inferencejob/new.tmpl
  20. +1
    -0
      templates/repo/modelarts/inferencejob/show.tmpl
  21. +1
    -0
      templates/repo/modelarts/notebook/new.tmpl
  22. +1
    -0
      templates/repo/modelarts/notebook/show.tmpl
  23. +3
    -47
      templates/repo/modelarts/trainjob/new.tmpl
  24. +1
    -0
      templates/repo/modelarts/trainjob/show.tmpl
  25. +1
    -0
      templates/repo/modelarts/trainjob/version_new.tmpl
  26. +1
    -0
      templates/repo/modelsafety/new.tmpl
  27. +1
    -0
      templates/repo/modelsafety/show.tmpl
  28. +5
    -0
      web_src/js/standalone/specsuse.js
  29. +11
    -0
      web_src/less/openi.less

+ 1
- 1
options/locale/locale_en-US.ini View File

@@ -3319,7 +3319,7 @@ shared_memory = Shared Memory
gpu_memory = GPU Memory
free = Free
point_hr = Point/hr
no_use_resource = No resources available

DEBUG = DEBUG
SNN4IMAGENET = BENCHMARK


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

@@ -3340,6 +3340,7 @@ shared_memory = 共享内存
gpu_memory = 显存
free = 免费
point_hr = 积分/时
no_use_resource = 暂无可用资源

DEBUG = 调试任务
SNN4IMAGENET = 评测任务


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

@@ -252,6 +252,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -428,6 +428,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));


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

@@ -547,6 +547,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -418,6 +418,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));


+ 1
- 0
templates/repo/cloudbrain/new.tmpl View File

@@ -263,6 +263,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -427,6 +427,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
})();

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

@@ -263,6 +263,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
var backUrl = new URLSearchParams(window.location.search).get("backurl");
if (backUrl) {


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

@@ -752,6 +752,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));


+ 1
- 0
templates/repo/grampus/notebook/gcu/new.tmpl View File

@@ -162,6 +162,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

+ 1
- 0
templates/repo/grampus/notebook/gpu/new.tmpl View File

@@ -170,6 +170,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

+ 1
- 0
templates/repo/grampus/notebook/npu/new.tmpl View File

@@ -170,6 +170,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -433,6 +433,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
})();


+ 1
- 0
templates/repo/grampus/trainjob/gcu/new.tmpl View File

@@ -247,6 +247,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
var backUrl = new URLSearchParams(window.location.search).get("backurl");
if (backUrl) {


+ 1
- 0
templates/repo/grampus/trainjob/gpu/new.tmpl View File

@@ -251,6 +251,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
var backUrl = new URLSearchParams(window.location.search).get("backurl");
if (backUrl) {


+ 1
- 41
templates/repo/grampus/trainjob/npu/new.tmpl View File

@@ -1,45 +1,4 @@
{{template "base/head" .}}
<style>
.min_title{
font-size: 14px !important;
margin-bottom: 2rem !important;
}
.width{
width:100% !important;
}
.width80{
width: 80.7% !important;
margin-left: 10px;
}
.width85{
width: 85% !important;
margin-left: 10.5rem !important;
align-items: center;
}
.width81{
width: 81% !important;
}
.width48 {
width: 48.5% !important;
}
.add{font-size: 18px;
padding: 0.5rem;
border: 1px solid rgba(187, 187, 187, 100);
border-radius: 0px 5px 5px 0px;
line-height: 21px;
text-align: center;
color: #C2C7CC;
}
.min{
font-size: 18px;
padding: 0.5rem;
border: 1px solid rgba(187, 187, 187, 100);
border-radius: 5px 0px 0px 5px;
line-height: 21px;
text-align: center;
color: #C2C7CC;
}
</style>
{{template "custom/global_mask" .}}
<div class="repository">
{{template "repo/header" .}}
@@ -266,6 +225,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
var backUrl = new URLSearchParams(window.location.search).get("backurl");
if (backUrl) {


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

@@ -584,6 +584,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec').text(specStr);
})();


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

@@ -571,6 +571,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -406,6 +406,7 @@ $(document).ready(function(){
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
})();


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

@@ -147,6 +147,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -348,6 +348,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
})();


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

@@ -1,49 +1,4 @@
{{template "base/head" .}}
<style>
.min_title{
font-size: 14px !important;
margin-bottom: 2rem !important;
}
.width{
width:100% !important;
}
.width48{
width: 48.5% !important;
}
.width80{
width: 80.7% !important;
}
.width85{
width: 85% !important;
margin-left: 10.5rem !important;
align-items: center;
}
.width81{
margin-left: 1.5rem;
width: 81% !important;
}

.add{font-size: 18px;
padding: 0.5rem;
border: 1px solid rgba(187, 187, 187, 100);
border-radius: 0px 5px 5px 0px;
line-height: 21px;
text-align: center;
color: #C2C7CC;
}
.min{
font-size: 18px;
padding: 0.5rem;
border: 1px solid rgba(187, 187, 187, 100);
border-radius: 5px 0px 0px 5px;
line-height: 21px;
text-align: center;
color: #C2C7CC;
}
</style>
<!-- <div class="ui page dimmer">
<div class="ui text loader">{{.i18n.Tr "loading"}}</div>
</div> -->
{{template "custom/global_mask" .}}
<div class="repository">
{{template "repo/header" .}}
@@ -240,7 +195,7 @@
</div>
<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>
<select class="ui dropdown width48" id="__specs__" name="spec_id" ovalue="{{.spec_id}}" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}></select>
<select class="ui dropdown width48" id="__specs__" name="spec_id" ovalue="{{.spec_id}}" {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} style="color:red"></select>
<span><i class="question circle icon link" data-content="{{.i18n.Tr "repo.modelarts.train_job.resource_helper"}}" data-position="right center" data-variation="mini"></i></span>
<a href="{{AppSubUrl}}/resource_desc" target="_blank">{{.i18n.Tr "custom.resource_description"}}</a>
{{if .CloudBrainPaySwitch}}
@@ -300,7 +255,7 @@
<script src="{{StaticUrlPrefix}}/js/cloudbrainNew.js?v={{MD5 AppVer}}" type="text/javascript"></script>
<script>
;(function() {
var SPECS = {{ .Specs }};
var SPECS = {{.Specs}};
var showPoint = {{ .CloudBrainPaySwitch }};
window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
@@ -308,6 +263,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

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

@@ -305,6 +305,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec{{$k}} div').text(specStr);
})();


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

@@ -285,6 +285,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();
</script>

+ 1
- 0
templates/repo/modelsafety/new.tmpl View File

@@ -394,6 +394,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
})();



+ 1
- 0
templates/repo/modelsafety/show.tmpl View File

@@ -665,6 +665,7 @@
point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
memory: {{$.i18n.Tr "cloudbrain.memory"}},
shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
no_use_resource:{{$.i18n.Tr "cloudbrain.no_use_resource"}},
});
$('td.ti-text-form-content.spec div').text(specStr);
SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));


+ 5
- 0
web_src/js/standalone/specsuse.js View File

@@ -19,6 +19,11 @@ window.renderSpecStr = (spec, showPoint, langObj) => {
};

window.renderSpecsSelect = (specsSel, data, showPoint, langObj) => {
if (data.length === 0) {
specsSel.append(`<option>${langObj.no_use_resource}</option>`);
specsSel.addClass('disabled red')
return
}
specsSel.empty();
data = data || [];
showPoint = specsSel.attr('blance') ? true : false;


+ 11
- 0
web_src/less/openi.less View File

@@ -1314,6 +1314,17 @@ i.SUCCEEDED {
.ui.attached.segment .ui.form .min_title .width80{
width: 80.7% !important;
}
.ui.attached.segment .ui.form .min_title .width{
width:100% !important;
}
.ui.attached.segment .ui.form .min_title .width85{
width: 85% !important;
margin-left: 10.5rem !important;
align-items: center;
}
.ui.attached.segment .ui.form .min_title .red{
color: red;
}
.tooltip-wati-count {
display: flex;
align-items: center;


Loading…
Cancel
Save