specs useage

options/locale/locale_en-US.ini

@@ -3134,6 +3134,9 @@ gpu_num = GPU
 cpu_num = CPU
 memory = Memory
 shared_memory = Shared Memory
+gpu_memory = GPU Memory
+free = Free
+point_hr = Point/hr
 
 
 DEBUG = DEBUG

options/locale/locale_zh-CN.ini

@@ -3150,6 +3150,9 @@ gpu_num = GPU数
 cpu_num = CPU数
 memory = 内存
 shared_memory = 共享内存
+gpu_memory = 显存
+free = 免费
+point_hr = 积分/时
 
 DEBUG = 调试任务
 SNN4IMAGENET =  评测任务

templates/repo/cloudbrain/benchmark/new.tmpl

@@ -71,7 +71,7 @@
                             onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
                     </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.gpu_type"}}</label>
                         <select id="cloudbrain_gpu_type" class="ui search dropdown width48" placeholder="选择GPU类型"
                             name="gpu_type">
@@ -79,7 +79,7 @@
                             <option value="{{.Queue}}">{{.Value}}</option>
                             {{end}}
                         </select>
-                    </div>
+                    </div>-->
                     <div class="required unite min_title two inline fields" style="margin-left: 80px;">
                         <div class="required ten wide field" style="width: 26.5% !important;">
                             <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.task_type"}}</label>&nbsp;
@@ -112,7 +112,7 @@
                     <div id="images-new-cb">
                     </div>
                     {{template "custom/select_dataset_train" .}}
-                    <div class="required min_title inline field" style="margin-top:2rem;">
+                    <!--<div class="required min_title inline field" style="margin-top:2rem;">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
                         <select id="cloudbrain_resource_spec" class="ui search dropdown"
                             placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
@@ -123,6 +123,13 @@
                             </option>
                             {{end}}
                         </select>
+                    </div>-->
+                    <div class="required min_title inline field" style="margin-top:2rem;">
+                        <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"}}" style='width:385px'
+                            name="resource_spec_id">
+                        </select>
                     </div>
                     <div class="inline min_title field">
                         <label class="label-fix-width" style="font-weight: normal;"></label>
@@ -167,7 +174,7 @@
                             onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
                     </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.gpu_type"}}</label>
                         <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型"
                             style='width:385px' name="gpu_type">
@@ -175,7 +182,7 @@
                             <option value="{{.Queue}}">{{.Value}}</option>
                             {{end}}
                         </select>
-                    </div>
+                    </div>-->
                     <div class="required unite inline min_title  fields" style="width: 90%;margin-left: 5.7rem;">&nbsp;
                         <div class="required eight wide field">
                             <label
@@ -205,7 +212,7 @@
                     <div id="images-new-cb">
                     </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>
                         <select id="cloudbrain_resource_spec" class="ui search dropdown"
                             placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
@@ -216,6 +223,14 @@
                             </option>
                             {{end}}
                         </select>
+                    </div>-->
+
+                    <div class="required min_title inline field">
+                        <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"}}" style='width:385px'
+                            name="resource_spec_id">
+                        </select>
                     </div>
 
                     <div class="inline min_title field required">
@@ -249,7 +264,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     let repolink = {{.RepoLink }}
     let url_href = window.location.pathname.split('create')[0]
@@ -340,4 +355,16 @@
     $('.ui.create_train_job.green.button').click(function (e) {
         validate()
     })
+
+    ;(function() {
+        var SPECS = {{ .benchmark_specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
 </script>

templates/repo/cloudbrain/benchmark/show.tmpl

@@ -453,7 +453,7 @@
                                                         {{$.i18n.Tr "cloudbrain.gpu_type"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content resorce_type">
                                                         <div class="text-span text-span-w">
                                                             {{$.resource_type}}
                                                         </div>
@@ -464,7 +464,7 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content spec">
                                                         <div class="text-span text-span-w">
                                                             {{$.resource_spec}}
                                                         </div>
@@ -571,6 +571,7 @@
 
 </div>
 {{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
     $('.menu .item').tab()
@@ -606,4 +607,17 @@
         });
     }
 
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec div').text(specStr);
+        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    })();
 </script>

templates/repo/cloudbrain/inference/new.tmpl

@@ -164,7 +164,7 @@
                         </select>
                 </div>
                 <!-- GPU 卡的类型 -->
-                <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.gpu_type"}}</label>
                     <select id="cloudbrain_gpu_type" class="ui search width48 dropdown gpu-type" placeholder="选择GPU类型"
                         style='width:385px' name="gpu_type">
@@ -185,7 +185,7 @@
                             {{end}}
                         {{end}}
                     </select>
-                </div>
+                </div>-->
                 <!-- 数据集 -->
                 {{template "custom/select_dataset_train" .}}
                 <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
@@ -221,7 +221,7 @@
                     </select>
                 </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>
                     <select id="cloudbrain_resource_spec" class="ui search dropdown width80" placeholder="选择资源规格" name="resource_spec_id">
                         {{if .resource_spec_id}}
@@ -242,8 +242,12 @@
                             {{end}}
                         {{end}}
                     </select>
+                </div>-->
+                <div class="required min_title inline field">
+                    <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="resource_spec_id">                        
+                    </select>
                 </div>
-                
                 <!-- 表单操作 -->
                 <div class="inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;"></label>
@@ -258,7 +262,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     const RepoLink = {{.RepoLink}}
     let nameMap,nameList
@@ -495,4 +499,15 @@
         send_run_para();
         validate();
     })
+    ;(function() {
+        var SPECS = {{ .inference_specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });       
+    })();
 </script>

templates/repo/cloudbrain/inference/show.tmpl

@@ -340,7 +340,7 @@
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}}
                                                     </td>
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content resorce_type">
                                                         <div class="text-span text-span-w">
                                                             {{$.resource_type}}
                                                         </div>
@@ -494,7 +494,7 @@
                                                                 {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                         </td>
 
-                                                        <td class="ti-text-form-content">
+                                                        <td class="ti-text-form-content spec">
                                                             <div class="text-span text-span-w">
                                                                 {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
                                                             </div>
@@ -551,6 +551,7 @@
 
 </div>
 {{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
     $('.menu .item').tab()
@@ -611,4 +612,17 @@
         document.getElementById("info_display").innerHTML = html;
     }
 
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec div').text(specStr);
+        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    })();
 </script>

templates/repo/cloudbrain/new.tmpl

@@ -108,8 +108,8 @@
                             {{end}}
                             {{end}}
                         </select>
-                    </div>
-                    <div class="inline required field">
+                    </div>        
+                    <!--<div class="inline required field">
                         <label>{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
                         <select id="cloudbrain_gpu_type" class="ui search dropdown gpu-type" placeholder="选择GPU类型"
                             style='width:385px' name="gpu_type">
@@ -117,7 +117,7 @@
                             <option value="{{.Queue}}">{{.Value}}</option>
                             {{end}}
                         </select>
-                    </div>
+                    </div>-->
 
                     <div id="images-new-cb">
 
@@ -125,8 +125,8 @@
                     <div id="select-multi-dataset">
 
                     </div>
-                    
-                    <div class="inline required field">
+                                        
+                    <!--<div class="inline required field">
                         <label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
                         <select id="cloudbrain_resource_spec" class="ui search dropdown"
                             placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
@@ -137,6 +137,14 @@
                             </option>
                             {{end}}
                         </select>
+                    </div>-->
+                 
+                    <div class="inline required field">
+                        <label>{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                        <select id="__specs__" class="ui search dropdown"
+                            placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
+                            name="spec_id">
+                        </select>
                     </div>
 
                     <div class="inline required field">
@@ -188,6 +196,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     let form = document.getElementById('form_id');
     $('#messageInfo').css('display', 'none')
@@ -285,4 +294,15 @@
         $('#store_category').attr("value", selected_value)
     })
 
+    ;(function() {
+        var SPECS = {{ .debug_specs }};
+        var showPoint = true;
+        window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });       
+    })();
 </script>

templates/repo/cloudbrain/show.tmpl

@@ -345,7 +345,7 @@
                                                         {{$.i18n.Tr "cloudbrain.gpu_type"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content resorce_type">
                                                         <div class="text-span text-span-w">
                                                             {{$.resource_type}}
                                                         </div>
@@ -424,10 +424,8 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
-                                                        </div>
+                                                    <td class="ti-text-form-content spec">
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -552,7 +550,7 @@
 
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     $('.menu .item').tab()
     $(document).ready(function () {
@@ -593,4 +591,17 @@
         }
         document.getElementById("info_display").innerHTML = html;
     }
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec').text(specStr);
+        $('td.ti-text-form-content.resorce_type').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    })();
 </script>

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -14,7 +14,9 @@
     .width {
         width: 100% !important;
     }
-
+    .width48 {
+        width: 48.5% !important;
+    }
     .width80 {
         width: 80.7% !important;
         margin-left: 10px;
@@ -167,7 +169,7 @@
                         <option name="job_type" value="TRAIN">TRAIN</option>
                     </select>
                 </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.gpu_type"}}</label>
                     <select id="cloudbrain_gpu_type" class="ui search width806 dropdown gpu-type" placeholder="选择GPU类型"
                         style='width:385px' name="gpu_type">
@@ -188,7 +190,7 @@
                             {{end}}
                         {{end}}
                     </select>
-                </div>
+                </div>-->
                 <div id="images-new-cb">
 
                 </div>
@@ -224,7 +226,7 @@
                     
                     </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>
                     <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="选择资源规格"
                         style='width:385px' name="resource_spec_id">
@@ -246,6 +248,13 @@
                             {{end}}
                         {{end}}
                     </select>
+                </div>-->
+
+                <div class="required min_title inline field">
+                    <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="resource_spec_id">
+                    </select>
                 </div>
 
                 <div class="inline field" style="padding: 1rem 0;">
@@ -264,7 +273,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     $('select.dropdown')
         .dropdown();
@@ -410,4 +419,15 @@
         send_run_para();
         validate(); 
     })
+    ;(function() {
+        var SPECS = {{ .train_specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });       
+    })();
 </script>

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -355,7 +355,7 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content resorce_type">
                                                         <div class="text-span text-span-w">
                                                             {{$.resource_type}}
                                                         </div>
@@ -366,7 +366,7 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content spec">
                                                         <div class="text-span text-span-w">
                                                             {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
                                                         </div>
@@ -640,6 +640,7 @@
 {{template "base/footer" .}}
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.excheck.js"></script>
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
    var setting = {
@@ -922,4 +923,17 @@
         document.getElementById("info_display").innerHTML = html;
     }
 
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec div').text(specStr);
+        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    })();
 </script>

templates/repo/modelarts/inferencejob/new.tmpl

@@ -241,7 +241,7 @@
                     </select>
                 </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>
                     <select class="ui dropdown width80" id="trainjob-flavor" name="flavor">
                         {{if .flavor}}
@@ -261,6 +261,10 @@
                             {{end}}
                         {{end}}
                     </select>
+                </div>-->
+                <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>
+                    <select class="ui dropdown width48" id="__specs__" name="spec_id"></select>
                 </div>
                 <!-- 计算节点 -->
                 <div class="inline required min_title field">
@@ -285,7 +289,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     const RepoLink = {{.RepoLink}}
     const url_href = window.location.pathname.split('create')[0]
@@ -517,4 +521,16 @@
         get_name()
         validate();
     })
+
+    ;(function() {
+        var SPECS = {{ .Specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
 </script>

templates/repo/modelarts/inferencejob/show.tmpl

@@ -435,7 +435,7 @@ td, th {
                                                                     {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                             </td>
 
-                                                            <td class="ti-text-form-content">
+                                                            <td class="ti-text-form-content spec">
                                                                 <div class="text-span text-span-w">
                                                                     {{.FlavorName}}
                                                                 </div>
@@ -511,6 +511,7 @@ td, th {
     <!-- 确认模态框 -->
 </div>
 {{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
 console.log('{{$.canDownload}}')
 $(document).ready(function(){
@@ -527,5 +528,17 @@ $(document).ready(function(){
     repoPath = urlArr.slice(-4)[0]
     jobID = urlArr.slice(-1)[0]
 })
-
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec div').text(specStr);
+        // $('td.ti-text-form-content.resorce_type').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    })();
 </script>

templates/repo/modelarts/notebook/new.tmpl

@@ -65,7 +65,7 @@
                         <label>类型</label>
                         <input name="job_type" id="cloudbrain_job_type" value="{{.notebook_type}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
                     </div> -->
-                    <div class="inline required field">
+                    <!--<div class="inline required field">
                         <label>{{.i18n.Tr "cloudbrain.specification"}}</label>
                         <select id="cloudbrain_flavor" class="ui search dropdown" placeholder="选择规格" style='width:385px' name="flavor">
                             {{range .flavors}}
@@ -73,6 +73,10 @@
 
                             {{end}}
                         </select>
+                    </div>-->
+                    <div class="inline required field">
+                        <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>
                     </div>
                     <!--<div class="inline required field">
                         <label>数据集存放路径</label>
@@ -95,7 +99,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     // 判断必填选项是否填写正确
     let form = document.getElementById('form_id');
@@ -173,4 +177,16 @@
     }
     });
     });
+
+    ;(function() {
+        var SPECS = {{ .Specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
 </script>

templates/repo/modelarts/notebook/show.tmpl

@@ -367,7 +367,7 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content spec">
                                                         <div class="text-span text-span-w">
                                                             {{$.resource_spec}}
                                                         </div>
@@ -481,7 +481,7 @@
 
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     $('.menu .item').tab()
 
@@ -492,4 +492,18 @@
         $('.secondary.menu .item').tab();
     });
 	console.log({{$.datasetDownload}})
+
+    ;(function() {
+        var SPEC = {{ .Spec }};
+        var showPoint = true;
+        var specStr = window.renderSpecStr(SPEC, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+        $('td.ti-text-form-content.spec').text(specStr);
+        $('td.ti-text-form-content.resorce_type').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    })();
 </script>

templates/repo/modelarts/trainjob/new.tmpl

@@ -254,7 +254,7 @@
                         </div>
                     </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>
                     <select class="ui dropdown width48" id="trainjob-flavor" name="flavor">
                         {{if .flavor}}
@@ -274,6 +274,10 @@
                             {{end}}
                         {{end}}
                     </select>
+                </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"></select>
                 </div>
                 <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>
@@ -307,7 +311,7 @@
     </div>
 </div>
 {{template "base/footer" .}}
-
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
     let url_href = window.location.pathname.split('create')[0]
     $(".ui.button").attr('href', url_href)
@@ -526,4 +530,16 @@
         send_run_para();
         validate();
     })
+
+    ;(function() {
+        var SPECS = {{ .Specs }};
+        var showPoint = true;
+        renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
 </script>

templates/repo/modelarts/trainjob/show.tmpl

@@ -1,5 +1,7 @@
 {{template "base/head" .}}
 <link rel="stylesheet" href="/self/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
+
 <style>
     .according-panel-heading {
         box-sizing: border-box;
@@ -391,11 +393,26 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
 
-                                                    <td class="ti-text-form-content">
+                                                    <td class="ti-text-form-content spec{{$k}}">                                                        
                                                         <div class="text-span text-span-w">
                                                             {{.FlavorName}}
                                                         </div>
                                                     </td>
+                                                    <script>
+                                                        ;(function() {
+                                                            var SPEC = {{ .Spec }};
+                                                            var showPoint = true;
+                                                            var specStr = window.renderSpecStr(SPEC, showPoint, {
+                                                                gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+                                                                free: {{$.i18n.Tr "cloudbrain.free"}},
+                                                                point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+                                                                memory: {{$.i18n.Tr "cloudbrain.memory"}},
+                                                                shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+                                                            });
+                                                            $('td.ti-text-form-content.spec{{$k}} div').text(specStr);
+                                                            // $('td.ti-text-form-content.resorce_type').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+                                                        })();
+                                                    </script>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">

web_src/js/standalone/specsuse.js

@@ -0,0 +1,27 @@
+window.ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'RTX3080', v: 'RTX3080' }];
+
+window.getListValueWithKey = (list, key, k = 'k', v = 'v', defaultV = '') => {
+  for (let i = 0, iLen = list.length; i < iLen; i++) {
+    const listI = list[i];
+    if (listI[k] === key) return listI[v];
+  }
+  return defaultV;
+};
+
+window.renderSpecStr = (spec, showPoint, langObj) => {
+  var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum === 0 ? '0' : spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
+  var gpuMemStr = spec.GPUMemGiB != 0 ? `${langObj.gpu_memory}: ${spec.GPUMemGiB}GB, ` : '';
+  var pointStr = showPoint ? `, ${spec.UnitPrice == 0 ? langObj.free : spec.UnitPrice + langObj.point_hr}` : '';
+  var specStr = `${ngpu}, CPU: ${spec.CpuCores}, ${gpuMemStr}${langObj.memory}: ${spec.MemGiB}GB, ${langObj.shared_memory}: ${spec.ShareMemGiB}GB${pointStr}`;
+  return specStr;
+};
+
+window.renderSpecsSelect = (specsSel, data, showPoint, langObj) => {
+  specsSel.empty();
+  data = data || [];
+  for (var i = 0, iLen = data.length; i < iLen; i++) {
+    var spec = data[i];
+    var specStr = window.renderSpecStr(spec, showPoint, langObj);
+    specsSel.append(`<option name="spec_id" value="${spec.ID}">${specStr}</option>`);
+  }
+}