From 6a99e33d4415c21fb2e9e74fbcb5b272c51687a6 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 22 Sep 2022 10:19:26 +0800 Subject: [PATCH 1/2] fix issue --- templates/repo/cloudbrain/trainjob/show.tmpl | 43 +++- templates/repo/grampus/trainjob/show.tmpl | 83 +++++--- templates/repo/modelarts/trainjob/show.tmpl | 78 ++++--- web_src/js/standalone/cloudbrainNew.js | 298 ++++++++++++++------------- 4 files changed, 293 insertions(+), 209 deletions(-) diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 0955d750a..45a9a0171 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -355,23 +355,32 @@ - {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} - -
+ +
{{if .ModelName}}{{.ModelName}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelconvert.modelversion"}} - -
+ +
{{if .ModelVersion}}{{.ModelVersion}}{{else}}--{{end}}
+ + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + +
{{if .CkptName}}{{.CkptName}}{{else}}--{{end}}
+ + + @@ -431,10 +440,28 @@
- {{.Parameters}} + {{if .Parameters}}{{.Parameters}}{{else}}--{{end}}
+ + + {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} + + + +
+ + + + + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + + + +
+ + @@ -443,7 +470,7 @@
- {{.Description}} + {{if .Description}}{{.Description}}{{else}}--{{end}}
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 8d9946a09..294d5bad0 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -319,7 +319,7 @@
- {{.VersionName}} + {{if .VersionName}}{{.VersionName}}{{else}}--{{end}}
@@ -351,23 +351,32 @@ + - {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} - -
+ +
{{if .ModelName}}{{.ModelName}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} + {{$.i18n.Tr "repo.modelconvert.modelversion"}} + -
- {{.WorkServerNumber}} -
+
{{if .ModelVersion}}{{.ModelVersion}}{{else}}--{{end}}
+ + + + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + + +
{{if .CkptName}}{{.CkptName}}{{else}}--{{end}}
@@ -408,47 +417,48 @@ + - {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}} + {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} -
- {{range $m ,$n := $.datasetDownload}} - {{if eq .IsDelete true}} - {{.DatasetName}}({{$.i18n.Tr "dataset.file_deleted"}}) - {{else}} - {{.DatasetName}} - {{end}} - - {{end}} +
+ {{if .Parameters}}{{.Parameters}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} + {{$.i18n.Tr "repo.grampus.train_job.ai_center"}} -
- {{.Parameters}} +
+ {{if $.ai_center}}{{$.ai_center}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.grampus.train_job.ai_center"}} + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+ + + + + {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} + -
- {{$.ai_center}} +
+ {{.WorkServerNumber}}
- {{$.i18n.Tr "repo.modelarts.train_job.description"}} @@ -457,7 +467,7 @@
- {{.Description}} + {{if .Description}}{{.Description}}{{else}}--{{end}}
@@ -466,7 +476,26 @@
- +
+ + + + + + {{range $m ,$n := $.datasetDownload}} + + + + {{end}} + +
{{$.i18n.Tr "dataset.file"}}
+ {{if eq .IsDelete true}} + {{.DatasetName}}({{$.i18n.Tr "dataset.file_deleted"}}) + {{else}} + {{.DatasetName}} + {{end}} +
+
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 2afabdf93..125d11517 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -393,28 +393,31 @@ - {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} - -
+ +
{{if .ModelName}}{{.ModelName}}{{else}}--{{end}}
+ + + + + {{$.i18n.Tr "repo.modelconvert.modelversion"}} + + + +
{{if .ModelVersion}}{{.ModelVersion}}{{else}}--{{end}}
+ + + + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + + +
{{if .CkptName}}{{.CkptName}}{{else}}--{{end}}
- -
@@ -461,22 +464,34 @@
- {{.Parameters}} + {{if .Parameters}}{{.Parameters}}{{else}}--{{end}}
+ - {{$.i18n.Tr "repo.modelarts.train_job.description"}} + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{.Cloudbrain.Description}} -
+ +
+ @@ -488,6 +503,18 @@ + + + {{$.i18n.Tr "repo.modelarts.train_job.description"}} + + + +
+ {{if .Cloudbrain.Description}}{{.Cloudbrain.Description}}{{else}}--{{end}} +
+ + @@ -693,7 +720,6 @@ -