diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index 879f733ec..daf3d5640 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -154,9 +154,7 @@ - - - +
@@ -188,14 +186,14 @@
{{template "custom/select_dataset_train" .}} - {{.i18n.Tr "cloudbrain.dataset_path_rule"}} +
{{if .bootFile}} @@ -206,7 +204,7 @@ - {{.i18n.Tr "cloudbrain.view_sample"}} + {{.i18n.Tr "cloudbrain.view_sample"}}
@@ -246,21 +244,13 @@
- -
- - -
- -
- {{.i18n.Tr "cloudbrain.inference_output_path_rule"}} -
+
diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index b02c9694b..e67a4c37f 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -227,307 +227,319 @@
{{with .task}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.cloudbrain.runinfo"}} - - {{$.i18n.Tr "repo.model_download"}} -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.cloudbrain_task"}} - -
- {{.DisplayJobName}} -
-
- {{$.i18n.Tr "repo.modelarts.status"}} - -
- {{.Status}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - -
- - {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - -
- {{.TrainJobDuration}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} - -
- {{$.resource_type}} -
-
- {{$.i18n.Tr "repo.model.manage.description"}} - -
- {{if .Description}} - {{.Description}} - {{else}} - -- - {{end}} -
-
- 创建人 - -
- {{$.userName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} - -
- {{.WorkServerNumber}} -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.modelarts.infer_job_model"}} - -
- {{.ModelName}}   - {{$.i18n.Tr "repo.modelarts.version"}}：{{.ModelVersion}}   - -
-
- {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} - -
- {{.CkptName}} -
-
- {{$.i18n.Tr "repo.modelarts.model_label"}} - -
- - {{if .LabelName}} - {{range $.labelName}} - {{.}} - {{end}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.code_version"}} - -
- {{.BranchName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} - -
- {{.BootFile}} -
-
- {{$.i18n.Tr "repo.modelarts.infer_dataset"}} - -
- {{.DatasetName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} - -
- {{if .Parameters}} - {{.Parameters}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{$.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}} -
-
+
+ +
+
+
+ + + +
+ {{TimeSinceUnix1 .CreatedUnix}} + + {{$.i18n.Tr "repo.modelarts.status"}}： + {{.Status}} + + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： + {{$.duration}} + +
-
+ +
-
- -
-
- -
{{template "base/footer" .}} @@ -547,41 +559,6 @@ let downlaodFlag = {{ $.canDownload }} let taskID = {{ $.task.ID }} let realJobName = {{ $.task.JobName }} - $(document).ready(function () { - let url = window.location.href; - let urlArr = url.split('/') - userName = urlArr.slice(-5)[0] - repoPath = urlArr.slice(-4)[0] - jobID = urlArr.slice(-1)[0] - }) - function stopBubbling(e) { - e = window.event || e; - if (e.stopPropagation) { - e.stopPropagation(); //阻止事件 冒泡传播 - } else { - e.cancelBubble = true; //ie兼容 - } - } - - - function refreshStatus(version_name) { - $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${taskID}?version_name=${versionname}`, (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) - loadLog(version_name) - - - }).fail(function (err) { - console.log(err); - }); - stopBubbling(arguments.callee.caller.arguments[0]) - } - function parseInfo() { let jsonValue = document.getElementById("json_value").value; let jsonObj = JSON.parse(jsonValue); diff --git a/templates/repo/modelarts/inferencejob/index.tmpl b/templates/repo/modelarts/inferencejob/index.tmpl index 89eb3f075..09991cfd7 100644 --- a/templates/repo/modelarts/inferencejob/index.tmpl +++ b/templates/repo/modelarts/inferencejob/index.tmpl @@ -72,28 +72,28 @@
-
+
{{$.i18n.Tr "repo.cloudbrain_task"}}
-
+
{{$.i18n.Tr "repo.modelarts.infer_job.model_version"}}
-
+
{{$.i18n.Tr "repo.modelarts.status"}}
-
+
{{$.i18n.Tr "repo.modelarts.createtime"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}
- -
+
+
{{$.i18n.Tr "repo.cloudbrain_creator"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -104,7 +104,7 @@
-
+
{{.DisplayJobName}} @@ -112,29 +112,29 @@
-
+
{{.ModelName}}  {{.ModelVersion}}
-
+
{{.Status}}
-
+
{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
-
+
{{.TrainJobDuration}}
- +
-
+
{{if .User.Name}} {{else}} @@ -142,7 +142,7 @@ {{end}}
-
+
{{if eq .Cloudbrain.Type 0 }}
diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index 116c464e3..6b2ade952 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -178,290 +178,323 @@ td, th {
{{with .task}} -
-
+
+ +
+
+
+ + + +
+ {{TimeSinceUnix1 .CreatedUnix}} + + {{$.i18n.Tr "repo.modelarts.status"}}： + {{.Status}} + + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： + {{.TrainJobDuration}} + - {{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.modelarts.log"}} - {{$.i18n.Tr "repo.model_download"}} +
+ + +
+
+
+
+
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "repo.cloudbrain_task"}} - -
- {{.DisplayJobName}} -
-
- {{$.i18n.Tr "repo.modelarts.status"}} - -
- {{.Status}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - -
- - {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - -
- {{.TrainJobDuration}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} - -
- {{.EngineName}} -
-
- {{$.i18n.Tr "repo.model.manage.description"}} - -
- {{if .Description}} - {{.Description}} - {{else}} - -- - {{end}} -
-
- 创建人 - -
- {{$.userName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} - -
- {{.WorkServerNumber}} -
-
-
-
- - - - - - - - - - - - - - + + + + + + + + + + + +
- {{$.i18n.Tr "repo.modelarts.infer_job_model"}} - -
- {{.ModelName}}   - {{$.i18n.Tr "repo.modelarts.version"}}：{{.ModelVersion}}   - -
-
- {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} - -
- {{.CkptName}} -
-
- {{$.i18n.Tr "repo.modelarts.model_label"}} - -
- - {{if .LabelName}} - {{range $.labelName}} - {{.}} + {{$.i18n.Tr "repo.modelarts.train_job.config"}} + {{$.i18n.Tr "repo.modelarts.log"}} + {{$.i18n.Tr "repo.model_download"}} +
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ {{$.i18n.Tr "repo.cloudbrain_task"}} + +
+ {{.DisplayJobName}} +
+
+ {{$.i18n.Tr "repo.modelarts.status"}} + +
+ {{.Status}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + +
+ + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + {{end}} + +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} + +
+ {{.TrainJobDuration}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} + +
+ {{.EngineName}} +
+
+ {{$.i18n.Tr "repo.model.manage.description"}} + +
+ {{if .Description}} + {{.Description}} + {{else}} + -- {{end}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.code_version"}} - -
- {{.BranchName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} - -
- {{.BootFile}} -
-
- {{$.i18n.Tr "repo.modelarts.infer_dataset"}} - -
- {{.DatasetName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} - -
- {{if .Parameters}} - {{.Parameters}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{.FlavorName}} -
-
+
+
+ 创建人 + +
+ {{$.userName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} + +
+ {{.WorkServerNumber}} +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{$.i18n.Tr "repo.modelarts.infer_job_model"}} + +
+ {{.ModelName}}   + {{$.i18n.Tr "repo.modelarts.version"}}：{{.ModelVersion}}   + +
+
+ {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + +
+ {{.CkptName}} +
+
+ {{$.i18n.Tr "repo.modelarts.model_label"}} + +
+ + {{if .LabelName}} + {{range $.labelName}} + {{.}} + {{end}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.modelarts.code_version"}} + +
+ {{.BranchName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} + +
+ {{.BootFile}} +
+
+ {{$.i18n.Tr "repo.modelarts.infer_dataset"}} + +
+ {{.DatasetName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} + +
+ {{if .Parameters}} + {{.Parameters}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+ {{.FlavorName}} +
+
+
+
+
-
-
+
+
+ + + {{$.i18n.Tr "repo.modelarts.download_log"}} + -
- +
+ + + + + + + +
+ + + 

+                                

 
-                    

-                    

-                            
-                                
-                            
-                            
-                                
-                            
-                        
-                        

-                            
-                            
-                            

-                        

+                            

 
-                    

+                        

+                        

+                            
+                            
+                            
-                

-                    
-                    
-                    
+                            

 
-                    

-                    

+                            

+                        

 
-                    

                 

-
+            

         

         {{end}}
 
@@ -471,25 +504,6 @@ td, th {
 
     

     
-    

-        

-            

-                 {{.i18n.Tr "cloudbrain.delete_task"}}
-            

-
-            

-                
{{.i18n.Tr "cloudbrain.task_delete_confirm"}}

-            

-            

-                

-                     {{.i18n.Tr "cloudbrain.operate_cancel"}}
-                

-                

-                     {{.i18n.Tr "cloudbrain.operate_confirm"}}
-                

-            

-        

-    

 

 {{template "base/footer" .}}