diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5befefaf51..f793db2ccf 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -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 diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 966d78cbd7..a0f2f62439 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3340,6 +3340,7 @@ shared_memory = 共享内存 gpu_memory = 显存 free = 免费 point_hr = 积分/时 +no_use_resource = 暂无可用资源 DEBUG = 调试任务 SNN4IMAGENET = 评测任务 diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 83ca5c9e07..e83b834f79 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl index be093049eb..b870287f91 100755 --- a/templates/repo/cloudbrain/benchmark/show.tmpl +++ b/templates/repo/cloudbrain/benchmark/show.tmpl @@ -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)); diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index 9eef6e1d88..25fd46c53b 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index 89b8e1b096..a592ac73c6 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -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)); diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index d5bc9bf01f..cb5425ea07 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index c5f7ac4910..2e10568ae1 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -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); })(); diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index 7aa842e301..068b18ff16 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -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) { diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index a29513fc38..8f271be89d 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -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)); diff --git a/templates/repo/grampus/notebook/gcu/new.tmpl b/templates/repo/grampus/notebook/gcu/new.tmpl index c355145c2d..8d9d96b84b 100644 --- a/templates/repo/grampus/notebook/gcu/new.tmpl +++ b/templates/repo/grampus/notebook/gcu/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/grampus/notebook/gpu/new.tmpl b/templates/repo/grampus/notebook/gpu/new.tmpl index 7c96060e47..0f7a5bcfdc 100644 --- a/templates/repo/grampus/notebook/gpu/new.tmpl +++ b/templates/repo/grampus/notebook/gpu/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/grampus/notebook/npu/new.tmpl b/templates/repo/grampus/notebook/npu/new.tmpl index 24daecc03f..b9de6e5ab5 100644 --- a/templates/repo/grampus/notebook/npu/new.tmpl +++ b/templates/repo/grampus/notebook/npu/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/grampus/notebook/show.tmpl b/templates/repo/grampus/notebook/show.tmpl index 655c339128..c570272b69 100644 --- a/templates/repo/grampus/notebook/show.tmpl +++ b/templates/repo/grampus/notebook/show.tmpl @@ -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); })(); diff --git a/templates/repo/grampus/trainjob/gcu/new.tmpl b/templates/repo/grampus/trainjob/gcu/new.tmpl index 02bab47919..07cf37f172 100644 --- a/templates/repo/grampus/trainjob/gcu/new.tmpl +++ b/templates/repo/grampus/trainjob/gcu/new.tmpl @@ -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) { diff --git a/templates/repo/grampus/trainjob/gpu/new.tmpl b/templates/repo/grampus/trainjob/gpu/new.tmpl index 2f48418582..881f2f7f1d 100755 --- a/templates/repo/grampus/trainjob/gpu/new.tmpl +++ b/templates/repo/grampus/trainjob/gpu/new.tmpl @@ -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) { diff --git a/templates/repo/grampus/trainjob/npu/new.tmpl b/templates/repo/grampus/trainjob/npu/new.tmpl index 6755473b3f..6bdaa53668 100755 --- a/templates/repo/grampus/trainjob/npu/new.tmpl +++ b/templates/repo/grampus/trainjob/npu/new.tmpl @@ -1,45 +1,4 @@ {{template "base/head" .}} - {{template "custom/global_mask" .}}
{{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) { diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 121cee9341..7ef8e40708 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -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); })(); diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl index 19ad10a755..522877353f 100644 --- a/templates/repo/modelarts/inferencejob/new.tmpl +++ b/templates/repo/modelarts/inferencejob/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index 56691b5f86..126576bc38 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -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); })(); diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 0d96955abd..ce6b602e78 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index afe79783b3..9c21f05c5e 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -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); })(); diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 8fc09bbd30..be66403aac 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -1,49 +1,4 @@ {{template "base/head" .}} - - {{template "custom/global_mask" .}}
{{template "repo/header" .}} @@ -240,7 +195,7 @@
- + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}} @@ -300,7 +255,7 @@ diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 7f52b1a079..c2dd84f0e3 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -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); })(); diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl index 07fae09d59..8ef040715d 100644 --- a/templates/repo/modelarts/trainjob/version_new.tmpl +++ b/templates/repo/modelarts/trainjob/version_new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index 2e6060f626..dc5ae7b0d3 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -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"}}, }); })(); diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl index c6f8789e9e..b800ece61f 100644 --- a/templates/repo/modelsafety/show.tmpl +++ b/templates/repo/modelsafety/show.tmpl @@ -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)); diff --git a/web_src/js/standalone/specsuse.js b/web_src/js/standalone/specsuse.js index bbdb7e90a9..8e873ad889 100644 --- a/web_src/js/standalone/specsuse.js +++ b/web_src/js/standalone/specsuse.js @@ -19,6 +19,11 @@ window.renderSpecStr = (spec, showPoint, langObj) => { }; window.renderSpecsSelect = (specsSel, data, showPoint, langObj) => { + if (data.length === 0) { + specsSel.append(``); + specsSel.addClass('disabled red') + return + } specsSel.empty(); data = data || []; showPoint = specsSel.attr('blance') ? true : false; diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 84d8e618dd..3dbf80faa3 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -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;