Merge branch 'gpu-inference' of git.openi.org.cn:OpenI/aiforge into gpu-inference

templates/repo/cloudbrain/inference/show.tmpl

@@ -268,7 +268,7 @@
                         <a class="item load-model-file" data-tab="four"
                             data-path="{{$.RepoLink}}/cloudbrain/inference-job/{{.JobID}}/result_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>
-                    <div class="ui tab active" data-tab="first">
+                    <div class="ui tab active" data-tab="first" style="height:400px">
                         <div style="padding-top: 10px;">
                             <div class="tab_2_content">
                                 <div class="ac-grid ac-grid-col2">

templates/repo/modelarts/inferencejob/index.tmpl

@@ -39,6 +39,16 @@
                     </div>
                 </div>
                 <div class="column right aligned">
+                    <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">
+                        {{svg "octicon-server" 16}}
+                        <div class="default text" style="color: rgba(0,0,0,.87);"></div>
+                        <i class="dropdown icon"></i>
+                        <div class="menu">
+                            <div class="item" data-value="all">{{$.i18n.Tr "repo.gpu_type_all"}}</div>
+                            <div class="item"  data-value="CPU/GPU">CPU/GPU</div>
+                            <div class="item"  data-value="NPU">NPU</div>
+                        </div>
+                    </div>
                     {{if .Permission.CanWrite $.UnitTypeCloudBrain}}
                     <a class="ui green button" href="{{.RepoLink}}/cloudbrain/inference-job/create">{{$.i18n.Tr "repo.modelarts.train_job.new_infer"}}</a>
                     {{else}}
@@ -264,3 +274,27 @@
 </div>
 {{template "base/footer" .}}
 
+<script>
+    let url = {{$.RepoLink}};
+    let all = {{$.i18n.Tr "repo.gpu_type_all"}}
+    $(document).ready(function(){
+    const params = new URLSearchParams(location.search)
+    if(!location.search){
+        $('.default.text').text(all)
+    }else{
+        if(!params.has('listType') || params.get('listType')=='all'){
+            $('.default.text').text(all)
+        }
+        else{
+            $('.default.text').text(params.get('listType'))
+        }
+    }
+    
+    $('.ui.selection.dropdown').dropdown({
+        onChange:function(value){
+            location.href = `${url}/modelarts/inference-job?listType=${value}`
+        }
+        })
+    })
+</script>
+

web_src/js/features/cloudrbanin.js

@@ -182,11 +182,11 @@ export default async function initCloudrain() {
       $.get(
         `/api/v1/repos/${repoPath}/${jobID}?version_name=${versionname}`,
         (data) => {
-          //$(`#${versionname}-duration-span`).text(data.JobDuration)
+          $(`#${versionname}-duration-span`).text(data.JobDuration);
           $(`#${versionname}-status-span span`).text(data.JobStatus);
           $(`#${versionname}-status-span i`).attr("class", data.JobStatus);
           // detail status and duration
-          //$('#'+versionname+'-duration').text(data.JobDuration)
+          $("#" + versionname + "-duration").text(data.JobDuration);
           $("#" + versionname + "-status").text(data.JobStatus);
           if (stopArray.includes(data.JobStatus)) {
             $("#" + versionname + "-stop").addClass("disabled");
@@ -339,13 +339,11 @@ export default async function initCloudrain() {
     $.get(
       `/api/v1/repos/${repoPath}/${ID}?version_name=${version_name}`,
       (data) => {
-        // header status and duration
-        //$(`#${version_name}-duration-span`).text(data.JobDuration)
         $(`#${version_name}-status-span span`).text(data.JobStatus);
         $(`#${version_name}-status-span i`).attr("class", data.JobStatus);
-        // detail status and duration
-        //$('#'+version_name+'-duration').text(data.JobDuration)
-        $("#" + version_name + "-status").text(data.JobStatus);
+        $(`#${version_name}-duration-span`).text(data.JobDuration);
+        $("#" + versionname + "-duration").text(data.JobDuration);
+        $("#" + versionname + "-status").text(data.JobStatus);
       }
     ).fail(function (err) {
       console.log(err);