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

templates/repo/cloudbrain/inference/show.tmpl

@@ -226,259 +226,230 @@
                 <div class="active section">{{.displayJobName}}</div>
             </div>
         </h4>
-        {{range $k ,$v := .version_list_task}}
-        <div class="ui accordion border-according" id="accordion{{.VersionName}}"
-            data-repopath="{{$.RepoRelPath}}/cloudbrain" data-jobid="{{.ID}}" data-version="{{.VersionName}}">
-            <input type="hidden" id="jobId_input" name="jobId_input" value="{{.JobID}}">
-            <div class="{{if eq $k 0}}active{{end}} title padding0">
-                <div class="according-panel-heading">
-                    <div class="accordion-panel-title">
-                        <i class="dropdown icon"></i>
-                        <span class="accordion-panel-title-content">
-                            <span>
-                                <div class="ac-display-inblock title_text acc-margin-bottom">
-                                    <span class="cti-mgRight-sm">{{TimeSinceUnix1 .CreatedUnix}}</span>
-
-                                    <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.status"}}：
-                                        <span id="{{.VersionName}}-status-span"><i id="icon"
-                                                style="vertical-align: middle;" class="{{.Status}}"></i><span id="text"
-                                                style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
-                                    </span>
-                                    <span
-                                        class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}：</span>
-                                    <span class="cti-mgRight-sm uc-accordionTitle-black"
-                                        id="{{.VersionName}}-duration-span">{{$.duration}}</span>
-
-                                </div>
-                            </span>
-                        </span>
-                    </div>
-                </div>
+        {{with .task}}
+        <div class="content-pad" style="border: 1px solid #e2e2e2;margin-top: 24px;padding: 20px 60px 40px 60px;">
+            <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
+                <a class="active item"
+                    data-tab="first">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
+                <a class="item" data-tab="second"
+                    onclick="javascript:parseInfo()">{{$.i18n.Tr "repo.cloudbrain.runinfo"}}</a>
+                <a class="item" data-tab="third"
+                    onclick="loadLog({{.VersionName}})">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                <a class="item" data-tab="four"
+                    onclick="loadModelFile({{.VersionName}},'','','init')">{{$.i18n.Tr "repo.model_download"}}</a>
             </div>
-            <div class="{{if eq $k 0}}active{{end}} content">
-                <div class="content-pad">
-                    <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
-                        <a class="active item"
-                            data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
-                        <a class="item" data-tab="second{{$k}}"
-                            onclick="javascript:parseInfo()">{{$.i18n.Tr "repo.cloudbrain.runinfo"}}</a>
-                        <a class="item" data-tab="third{{$k}}"
-                            onclick="loadLog({{.VersionName}})">{{$.i18n.Tr "repo.modelarts.log"}}</a>
-                        <a class="item" data-tab="four{{$k}}"
-                            onclick="loadModelFile({{.VersionName}},'','','init')">{{$.i18n.Tr "repo.model_download"}}</a>
-                    </div>
-                    <div class="ui tab active" data-tab="first{{$k}}">
-                        <div style="padding-top: 10px;">
-                            <div class="tab_2_content">
-                                <div class="ac-grid ac-grid-col2">
-                                    <div class="ac-grid-col">
-                                        <table class="ti-form">
-                                            <tbody class="ti-text-form">
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.cloudbrain_task"}}
-                                                    </td>
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{.DisplayJobName}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.status"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-status">
-                                                            {{.Status}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.start_time"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            <span style="font-size: 12px;"
-                                                                class="">{{TimeSinceUnix1 .CreatedUnix}}</span>
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-duration">
-                                                            {{$.duration}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                                <tr class="ti-no-ng-animate">
-                                                    <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">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_type}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.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>
-                                                </tr>
-
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                    <div class="ac-grid-col">
-                                        <table class="ti-form">
-                                            <tbody class="ti-text-form">
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "cloudbrain.mirror"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                            {{.Image}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.code_version"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{.BranchName}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{.BootFile}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{.DatasetName}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" title="{{.Parameters}}">
-                                                            {{.Parameters}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-
-                                                <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.description"}}
-                                                    </td>
-
-                                                    <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" title="{{.Description}}">
-                                                            {{.Description}}
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
+            <div class="ui tab active" data-tab="first">
+                <div style="padding-top: 10px;">
+                    <div class="tab_2_content">
+                        <div class="ac-grid ac-grid-col2">
+                            <div class="ac-grid-col">
+                                <table class="ti-form">
+                                    <tbody class="ti-text-form">
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.cloudbrain_task"}}
+                                            </td>
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w">
+                                                    {{.DisplayJobName}}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.status"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w" id="{{.VersionName}}-status">
+                                                    {{.Status}}
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.train_job.start_time"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w">
+                                                    <span style="font-size: 12px;"
+                                                        class="">{{TimeSinceUnix1 .CreatedUnix}}</span>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w"
+                                                    id="{{.VersionName}}-duration">
+                                                    {{$.duration}}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr class="ti-no-ng-animate">
+                                            <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">
+                                                <div class="text-span text-span-w">
+                                                    {{$.resource_type}}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.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>
+                                        </tr>
+
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="ac-grid-col">
+                                <table class="ti-form">
+                                    <tbody class="ti-text-form">
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "cloudbrain.mirror"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                    {{.Image}}
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.code_version"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w">
+                                                    {{.BranchName}}
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w">
+                                                    {{.BootFile}}
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w">
+                                                    {{.DatasetName}}
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w" title="{{.Parameters}}">
+                                                    {{.Parameters}}
+                                                </div>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="ti-no-ng-animate">
+                                            <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                {{$.i18n.Tr "repo.modelarts.train_job.description"}}
+                                            </td>
+
+                                            <td class="ti-text-form-content">
+                                                <div class="text-span text-span-w" title="{{.Description}}">
+                                                    {{.Description}}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
-
                         </div>
                     </div>
 
-                    <div class="ui tab" data-tab="second{{$k}}">
-                        <div>
-                            <div class="ui message message{{.VersionName}}" style="display: none;">
-                                <div id="header"></div>
-                            </div>
-                            <div class="ui attached  log" id="log{{.VersionName}}"
-                                style="height: 390px !important; overflow: auto;">
-                                <input type="hidden" id="json_value" value="{{$.result.JobStatus.AppExitDiagnostics}}">
-                                <input type="hidden" id="ExitDiagnostics" value="{{$.ExitDiagnostics}}">
-                                <span id="info_display" class="info_text">
-
-                                </span>
-                            </div>
+                </div>
+            </div>
 
-                        </div>
+            <div class="ui tab" data-tab="second">
+                <div>
+                    <div class="ui message message{{.VersionName}}" style="display: none;">
+                        <div id="header"></div>
+                    </div>
+                    <div class="ui attached  log" id="log{{.VersionName}}"
+                        style="height: 390px !important; overflow: auto;">
+                        <input type="hidden" id="json_value" value="{{$.result.JobStatus.AppExitDiagnostics}}">
+                        <input type="hidden" id="ExitDiagnostics" value="{{$.ExitDiagnostics}}">
+                        <span id="info_display" class="info_text">
 
+                        </span>
                     </div>
 
-                    <div class="ui tab" data-tab="third{{$k}}">
-                        <div>
-                            <div class="ui message message{{.VersionName}}" style="display: none;">
-                                <div id="header"></div>
-                            </div>
-                            <div class="ui attached  log" id="log{{.VersionName}}"
-                                style="height: 300px !important; overflow: auto;">
-                                <input type="hidden" name="end_line" value>
-                                <input type="hidden" name="start_line" value>
-                                <pre id="log_file{{.VersionName}}"></pre>
-                            </div>
+                </div>
 
-                        </div>
+            </div>
 
+            <div class="ui tab" data-tab="third">
+                <div>
+                    <div class="ui message message{{.VersionName}}" style="display: none;">
+                        <div id="header"></div>
+                    </div>
+                    <div class="ui attached  log" id="log{{.VersionName}}"
+                        style="height: 300px !important; overflow: auto;">
+                        <input type="hidden" name="end_line" value>
+                        <input type="hidden" name="start_line" value>
+                        <pre id="log_file{{.VersionName}}"></pre>
                     </div>
 
-                    <div class="ui tab" data-tab="four{{$k}}">
-                        <input type="hidden" name="model{{.VersionName}}" value="-1">
-                        <input type="hidden" name="modelback{{.VersionName}}" value="-1">
-                        <div class='ui breadcrumb model_file_bread' id='file_breadcrumb{{.VersionName}}'>
-                            <div class="active section">{{.VersionName}}</div>
-                            <div class="divider"> / </div>
+                </div>
+
+            </div>
 
-                        </div>
-                        <div id="dir_list{{.VersionName}}">
+            <div class="ui tab" data-tab="four">
+                <input type="hidden" name="model{{.VersionName}}" value="-1">
+                <input type="hidden" name="modelback{{.VersionName}}" value="-1">
+                <div class='ui breadcrumb model_file_bread' id='file_breadcrumb{{.VersionName}}'>
+                    <div class="active section">{{.VersionName}}</div>
+                    <div class="divider"> / </div>
 
-                        </div>
-                    </div>
+                </div>
+                <div id="dir_list{{.VersionName}}">
 
                 </div>
             </div>
+
         </div>
+            
+        
         {{end}} {{template "base/paginate" .}}
     </div>
     <!-- 确认模态框 -->

templates/repo/modelarts/inferencejob/index.tmpl

@@ -105,7 +105,7 @@
 
                                 <!-- 任务名 -->
                                 <div class="three wide column padding0">
-                                    <a class="title" href="{{$.RepoRelPath}}/{{if eq .Cloudbrain.Type 0 }}cloudbrain{{else}}modelarts{{end}}/inference-job/{{.JobID}}" title="{{.DisplayJobName}}" style="font-size: 14px;">
+                                    <a class="title" href="/{{$.RepoRelPath}}/{{if eq .Cloudbrain.Type 0 }}cloudbrain{{else}}modelarts{{end}}/inference-job/{{.JobID}}" title="{{.DisplayJobName}}" style="font-size: 14px;">
 
                                         <span class="fitted" style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>