diff --git a/templates/custom/wait_count.tmpl b/templates/custom/wait_count.tmpl index a70dfc5f5..77c49712d 100644 --- a/templates/custom/wait_count.tmpl +++ b/templates/custom/wait_count.tmpl @@ -1,4 +1,28 @@
- - {{.i18n.Tr "repo.wait_count_start"}}{{.WaitCount}}{{.i18n.Tr "repo.wait_count_end"}} + {{$queue := ""}} + {{$gpuQueue := 0}} + {{range $k,$v :=.gpu_types}} + {{if eq $k 0}} + {{ $queue := $v.Queue }} + {{ end }} + {{ end }} + + {{ range $k,$v :=.QueuesDetail }} + {{if eq $k $queue}} + {{$gpuQueue :=$v}} + {{ end }} + {{ end }} + + {{.i18n.Tr "repo.wait_count_start"}} + {{if .QueuesDetail}} + {{ $gpuQueue }} + {{else}} + {{.WaitCount}} + {{ end }} + {{.i18n.Tr "repo.wait_count_end"}}
diff --git a/templates/custom/wait_count_train.tmpl b/templates/custom/wait_count_train.tmpl index 661eb268d..ef6c4ed61 100644 --- a/templates/custom/wait_count_train.tmpl +++ b/templates/custom/wait_count_train.tmpl @@ -1,13 +1,25 @@
+ {{$queue := ""}} + {{$gpuQueue := 0}} + {{range $k,$v :=.gpu_types}} + {{if eq $k 0}} + {{ $queue := $v.Queue }} + {{ end }} + {{ end }} + + {{ range $k,$v :=.QueuesDetail }} + {{if eq $k $queue}} + {{$gpuQueue :=$v}} + {{ end }} + {{ end }} - {{.QueuesDetail}} {{.i18n.Tr "repo.wait_count_start"}} {{if .QueuesDetail}} - {{.QueuesDetail.a100}} + {{ $gpuQueue }} {{else}} {{.WaitCount}} {{ end }} diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index 3fd614f59..20a52db34 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -49,6 +49,7 @@ {{template "repo/header" .}}
{{template "base/alert" .}} +

{{.i18n.Tr "repo.modelarts.train_job.new_infer"}}

@@ -185,7 +186,7 @@
- diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 805432b59..b25853e9c 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -121,7 +121,7 @@ {{template "repo/header" .}}
- + {{template "base/alert" .}}

@@ -209,7 +209,7 @@
- {{range .train_gpu_types}} diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 4ab6663d5..8df46b168 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -433,6 +433,41 @@ export default async function initCloudrain() { const redirect_to = this.dataset.linkpath; debugAgain(ID, repoPath, redirect_to); }); + + function setWaitNums() { + console.log($(".cloudbrain-type")); + if ($(".cloudbrain-type").length === 0 && $(".gpu-type").length === 0) { + return; + } + let waitNums = $(".cloudbrain-type").data("queue").split("map")[1]; + let test = new Map(); + let waitNumsArray = waitNums.split(" "); + waitNumsArray.forEach((element, index) => { + if (index === 0) { + test.set(element.slice(1, -2), parseInt(element.slice(-1))); + } else if (index === waitNumsArray.length - 1) { + test.set(element.slice(0, -3), parseInt(element.slice(-2, -1))); + } else { + test.set(element.slice(0, -2), parseInt(element.slice(-1))); + } + }); + console.log(test); + $(".ui.search.dropdown.gpu-type").dropdown({ + onChange: function (value, text, $selectedItem) { + console.log("=-------------", value); + console.log("=-------------", test.get(value)); + let gpuTypeNums = test.get(value); + let gpuTypeNumString = + $(".cloudbrain-type").data("queue-start") + + " " + + gpuTypeNums + + " " + + $(".cloudbrain-type").data("queue-end"); + $("#gpu-nums").text(gpuTypeNumString); + }, + }); + } + setWaitNums(); } function userSearchControll() {