From f62b76c912bddbf3ef75fbd78ea95e0106b62fdf Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 11:16:52 +0800 Subject: [PATCH 1/2] fix issue --- templates/repo/cloudbrain/inference/show.tmpl | 2 ++ templates/repo/cloudbrain/new.tmpl | 4 ++++ templates/repo/cloudbrain/show.tmpl | 2 ++ templates/repo/cloudbrain/trainjob/show.tmpl | 2 ++ templates/repo/debugjob/index.tmpl | 15 ++++++++++----- templates/repo/grampus/notebook/gpu/new.tmpl | 4 ++++ templates/repo/grampus/notebook/npu/new.tmpl | 4 ++++ templates/repo/grampus/notebook/show.tmpl | 4 +++- templates/repo/grampus/trainjob/show.tmpl | 2 ++ templates/repo/modelarts/inferencejob/show.tmpl | 2 ++ templates/repo/modelarts/notebook/new.tmpl | 4 ++++ templates/repo/modelarts/notebook/show.tmpl | 5 ++++- web_src/js/features/cloudbrainShow.js | 1 + web_src/js/index.js | 3 +++ web_src/js/standalone/cloudbrainNew.js | 5 ----- web_src/vuepages/pages/notebook/debug/index.vue | 1 + 16 files changed, 48 insertions(+), 12 deletions(-) diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index c900bf908..629de575e 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -294,6 +294,7 @@
+ {{if $.datasetDownload}} @@ -314,6 +315,7 @@
{{$.i18n.Tr "dataset.file"}}
+ {{end}}
diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index c5eaaa1ff..6ba7da6cc 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -282,6 +282,10 @@ $('#messageInfo p').text(str) return false } + if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){ + $('input[name="ckpt_name"]').parent().addClass("error") + return false + } let min_value_task = value_task.toLowerCase() $("input[name='display_job_name']").attr("value", min_value_task) createFlag = true diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 46f711e83..b2c708cc9 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -303,6 +303,7 @@
+ {{if $.datasetDownload}} @@ -323,6 +324,7 @@
{{$.i18n.Tr "dataset.file"}}
+ {{end}}
diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 09c0f317d..786298908 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -277,6 +277,7 @@
+ {{if $.datasetDownload}} @@ -297,6 +298,7 @@
{{$.i18n.Tr "dataset.file"}}
+ {{end}}
diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index 66463b90e..255bde108 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -195,7 +195,7 @@ {{$.i18n.Tr "repo.modelarts.createtime"}}
- {{$.i18n.Tr "repo.modelarts.computing_resources"}} + {{$.i18n.Tr "repo.modelarts.cluster.computing_resources"}}
{{$.i18n.Tr "repo.cloudbrain_creator"}} @@ -234,9 +234,14 @@
- - {{.ComputeResource}} + + {{if eq .Cloudbrain.Type 2}} + {{$.i18n.Tr "cloudbrain.resource_cluster_c2net_simple"}} + {{else}} + {{$.i18n.Tr "cloudbrain.resource_cluster_openi_simple"}} + {{end}} + {{.ComputeResource}} +
{{if .User.Name}} @@ -297,7 +302,7 @@ class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING" "CREATING" "STARTING" "SUCCEEDED" "CREATE_FAILED" "DELETED"}}disabled {{else}}blue {{end}}button' data-repopath='{{$.RepoLink}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{.Cloudbrain.ID}}/stop' data-jobid="{{.Cloudbrain.ID}}"> - {{if .BootFile}}data-bootfile="{{.BootFile}}"{{end}} + {{$.i18n.Tr "repo.stop"}} {{else}} diff --git a/templates/repo/grampus/notebook/gpu/new.tmpl b/templates/repo/grampus/notebook/gpu/new.tmpl index da3522471..2192c064b 100644 --- a/templates/repo/grampus/notebook/gpu/new.tmpl +++ b/templates/repo/grampus/notebook/gpu/new.tmpl @@ -190,6 +190,10 @@ $('#messageInfo p').text(str) return false } + if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){ + $('input[name="ckpt_name"]').parent().addClass("error") + return false + } let min_value_task = value_task.toLowerCase() $("input[name='display_job_name']").attr("value", min_value_task) createFlag = true diff --git a/templates/repo/grampus/notebook/npu/new.tmpl b/templates/repo/grampus/notebook/npu/new.tmpl index 986a71696..f59328c19 100644 --- a/templates/repo/grampus/notebook/npu/new.tmpl +++ b/templates/repo/grampus/notebook/npu/new.tmpl @@ -180,6 +180,10 @@ $('#messageInfo p').text(str) return false } + if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){ + $('input[name="ckpt_name"]').parent().addClass("error") + return false + } let min_value_task = value_task.toLowerCase() $("input[name='display_job_name']").attr("value",min_value_task) document.getElementById("mask").style.display = "block" diff --git a/templates/repo/grampus/notebook/show.tmpl b/templates/repo/grampus/notebook/show.tmpl index 57cc6dab5..8f0ea5c5c 100644 --- a/templates/repo/grampus/notebook/show.tmpl +++ b/templates/repo/grampus/notebook/show.tmpl @@ -344,6 +344,7 @@
+ {{if $.datasetDownload}} @@ -370,8 +371,9 @@ {{end}} + {{end}}
{{$.i18n.Tr "dataset.file"}}
- {{if eq .ComputeResource "NPU"}} + {{if and (eq .ComputeResource "NPU") ($.modelDownload)}} diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 7fbb6c416..3d61282af 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -308,6 +308,7 @@
+ {{if $.datasetDownload}}
@@ -326,6 +327,7 @@ {{end}}
{{$.i18n.Tr "dataset.file"}}
+ {{end}}
diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index 1f2e1a5c8..abe0bc8d2 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -278,6 +278,7 @@
+ {{if $.datasetDownload}} @@ -299,6 +300,7 @@
{{$.i18n.Tr "dataset.file"}}
+ {{end}}
diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 34d9a4cc6..0fda3f56c 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -163,6 +163,10 @@ $('#messageInfo p').text(str) return false } + if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){ + $('input[name="ckpt_name"]').parent().addClass("error") + return false + } let min_value_task = value_task.toLowerCase() $("input[name='display_job_name']").attr("value",min_value_task) document.getElementById("mask").style.display = "block" diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 61a3c1dfb..bff0bd231 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -246,6 +246,7 @@
+ {{if $.datasetDownload}} @@ -268,7 +269,8 @@ {{end}}
{{$.i18n.Tr "dataset.file"}}
- + {{end}} + {{if $.modelDownload}} @@ -291,6 +293,7 @@
+ {{end}}
diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js index 8de5bcdfe..4a6351a4f 100644 --- a/web_src/js/features/cloudbrainShow.js +++ b/web_src/js/features/cloudbrainShow.js @@ -823,6 +823,7 @@ export default async function initCloudrainSow() { $("#select_model_version").dropdown("set value", ""); $("#select_model_checkpoint").dropdown("set text", ""); $("#select_model_checkpoint").dropdown("set value", ""); + $("#model_checkpoint").empty(); } }, }); diff --git a/web_src/js/index.js b/web_src/js/index.js index 9d67c5004..16daad7de 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -5226,3 +5226,6 @@ function initTopToHome() { } initTopToHome(); +$(".question.circle.icon").hover(function () { + $(this).popup("show"); +}); \ No newline at end of file diff --git a/web_src/js/standalone/cloudbrainNew.js b/web_src/js/standalone/cloudbrainNew.js index bea652dfd..40e873847 100644 --- a/web_src/js/standalone/cloudbrainNew.js +++ b/web_src/js/standalone/cloudbrainNew.js @@ -67,11 +67,6 @@ $(this).attr("id", "para" + cur_index); }); }); - - $(".question.circle.icon").hover(function () { - $(this).popup("show"); - }); - var isValidate = false; function validate() { $(".ui.form").form({ diff --git a/web_src/vuepages/pages/notebook/debug/index.vue b/web_src/vuepages/pages/notebook/debug/index.vue index cac76a883..55afb57fa 100644 --- a/web_src/vuepages/pages/notebook/debug/index.vue +++ b/web_src/vuepages/pages/notebook/debug/index.vue @@ -345,6 +345,7 @@ export default { } if(err.response.status===401){ location.href=`${AppSubUrl}/user/login` + return } this.btnStatus[index]=0 this.alertCb = false From d63aad440e0effd8d765a26c39b78767473d2ba0 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 15 Dec 2022 11:25:32 +0800 Subject: [PATCH 2/2] fix issue --- templates/repo/cloudbrain/inference/show.tmpl | 2 -- templates/repo/grampus/notebook/show.tmpl | 2 +- templates/repo/grampus/trainjob/show.tmpl | 2 -- templates/repo/modelarts/inferencejob/show.tmpl | 2 -- templates/repo/modelarts/notebook/show.tmpl | 2 +- templates/repo/modelarts/trainjob/version_new.tmpl | 5 +++++ 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index 629de575e..c900bf908 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -294,7 +294,6 @@
- {{if $.datasetDownload}} @@ -315,7 +314,6 @@
{{$.i18n.Tr "dataset.file"}}
- {{end}}
diff --git a/templates/repo/grampus/notebook/show.tmpl b/templates/repo/grampus/notebook/show.tmpl index 8f0ea5c5c..3768e9f06 100644 --- a/templates/repo/grampus/notebook/show.tmpl +++ b/templates/repo/grampus/notebook/show.tmpl @@ -373,7 +373,7 @@ {{end}} - {{if and (eq .ComputeResource "NPU") ($.modelDownload)}} + {{if and (eq .ComputeResource "NPU") ($.modelDownload.Name)}} diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 3d61282af..7fbb6c416 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -308,7 +308,6 @@
- {{if $.datasetDownload}}
@@ -327,7 +326,6 @@ {{end}}
{{$.i18n.Tr "dataset.file"}}
- {{end}} diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index abe0bc8d2..1f2e1a5c8 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -278,7 +278,6 @@
- {{if $.datasetDownload}} @@ -300,7 +299,6 @@
{{$.i18n.Tr "dataset.file"}}
- {{end}}
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index bff0bd231..293c0bfbc 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -270,7 +270,7 @@ {{end}} - {{if $.modelDownload}} + {{if $.modelDownload.Name}} diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl index cb616a790..b35ec5f35 100644 --- a/templates/repo/modelarts/trainjob/version_new.tmpl +++ b/templates/repo/modelarts/trainjob/version_new.tmpl @@ -13,6 +13,11 @@ .width48{ width: 48.5% !important; } +.width85{ + width: 85% !important; + margin-left: 10.5rem !important; + align-items: center; +} {{template "custom/global_mask" .}}