Browse Source

fix issue

tags/v1.22.7.1
zhoupzh 3 years ago
parent
commit
da640b58d5
7 changed files with 109 additions and 14 deletions
  1. +26
    -2
      templates/custom/wait_count.tmpl
  2. +14
    -2
      templates/custom/wait_count_train.tmpl
  3. +2
    -1
      templates/repo/cloudbrain/inference/new.tmpl
  4. +1
    -1
      templates/repo/cloudbrain/inference/show.tmpl
  5. +29
    -6
      templates/repo/cloudbrain/new.tmpl
  6. +2
    -2
      templates/repo/cloudbrain/trainjob/new.tmpl
  7. +35
    -0
      web_src/js/features/cloudrbanin.js

+ 26
- 2
templates/custom/wait_count.tmpl View File

@@ -1,4 +1,28 @@
<div class="tooltip-wati-count">
<i class="ri-error-warning-line" style="margin-right: 0.5rem; font-size: 16px"></i>
<span>{{.i18n.Tr "repo.wait_count_start"}}{{.WaitCount}}{{.i18n.Tr "repo.wait_count_end"}}</span>
{{$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 }}
<i
class="ri-error-warning-line"
style="margin-right: 0.5rem; font-size: 16px"
></i>
<span id="gpu-nums"
>{{.i18n.Tr "repo.wait_count_start"}}
{{if .QueuesDetail}}
{{ $gpuQueue }}
{{else}}
{{.WaitCount}}
{{ end }}
{{.i18n.Tr "repo.wait_count_end"}}</span
>
</div>

+ 14
- 2
templates/custom/wait_count_train.tmpl View File

@@ -1,13 +1,25 @@
<div class="tooltip-wati-count" style="margin-left: 155px">
{{$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 }}
<i
class="ri-error-warning-line"
style="margin-right: 0.5rem; font-size: 16px"
></i>
{{.QueuesDetail}}
<span
>{{.i18n.Tr "repo.wait_count_start"}}
{{if .QueuesDetail}}
{{.QueuesDetail.a100}}
{{ $gpuQueue }}
{{else}}
{{.WaitCount}}
{{ end }}


+ 2
- 1
templates/repo/cloudbrain/inference/new.tmpl View File

@@ -49,6 +49,7 @@
{{template "repo/header" .}}
<div class="ui container">
{{template "base/alert" .}}
<div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
<h4 class="ui top attached header">
{{.i18n.Tr "repo.modelarts.train_job.new_infer"}}
</h4>
@@ -185,7 +186,7 @@
<!-- GPU 卡的类型 -->
<div class="required min_title inline field">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
<select id="cloudbrain_gpu_type" class="ui search width806 dropdown" placeholder="选择GPU类型"
<select id="cloudbrain_gpu_type" class="ui search width48 dropdown gpu-type" placeholder="选择GPU类型"
style='width:385px' name="gpu_type">
{{range .train_gpu_types}}
<option value="{{.Queue}}">{{.Value}}</option>


+ 1
- 1
templates/repo/cloudbrain/inference/show.tmpl View File

@@ -492,7 +492,7 @@
<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">result</div>
<div class="active section">{{.VersionName}}</div>
<div class="divider"> / </div>

</div>


+ 29
- 6
templates/repo/cloudbrain/new.tmpl View File

@@ -121,7 +121,7 @@
{{template "repo/header" .}}
<div class="repository new repo ui middle very relaxed page grid">
<div class="column">
<div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
<div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
{{template "base/alert" .}}
<div class="ui negative message" id="messageInfo">
<p></p>
@@ -209,7 +209,7 @@
</div>
<div class="inline required field">
<label>{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
<select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型"
<select id="cloudbrain_gpu_type" class="ui search dropdown gpu-type" placeholder="选择GPU类型"
style='width:385px' name="gpu_type">
{{range .gpu_types}}
<option value="{{.Queue}}">{{.Value}}</option>
@@ -320,6 +320,7 @@
if (document.readyState === "complete") {
document.getElementById("mask").style.display = "none"
}
}

$('#cloudbrain_benchmark_category')
@@ -327,14 +328,36 @@
placeholder: "选择数据集类别",
})

$('select.dropdown')
.dropdown();

console.log("=======================")
// $(document).ready(function(){
// 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)
// $('#gpu-nums').text("{{.i18n.Tr "repo.wait_count_start"}}"+gpuTypeNums+"{{.i18n.Tr "repo.wait_count_end"}}")

// }
// });
// })

// $('#cloudbrain_image').select2({
// placeholder: "选择镜像"
// });


$(".ui.button.reset").click(function (e) {
e.preventDefault()


+ 2
- 2
templates/repo/cloudbrain/trainjob/new.tmpl View File

@@ -79,7 +79,7 @@
<div class="repository">
{{template "repo/header" .}}
<div class="ui container">
<div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
<div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "repo.modelarts.train_job.new"}}
@@ -182,7 +182,7 @@

<div class="required min_title inline field">
<label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
<select id="cloudbrain_gpu_type" class="ui search width806 dropdown" placeholder="选择GPU类型"
<select id="cloudbrain_gpu_type" class="ui search width806 dropdown gpu-type" placeholder="选择GPU类型"
style='width:385px' name="gpu_type">
{{range .train_gpu_types}}
<option value="{{.Queue}}">{{.Value}}</option>


+ 35
- 0
web_src/js/features/cloudrbanin.js View File

@@ -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() {


Loading…
Cancel
Save