From 440e865bdd8f369feee521ca45d3b88714e3d350 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 18 Jul 2022 17:24:06 +0800 Subject: [PATCH 1/3] fix issue --- templates/custom/wait_count.tmpl | 5 +-- templates/repo/grampus/trainjob/show.tmpl | 42 ++++++++++---------- templates/repo/modelarts/trainjob/show.tmpl | 61 +++++++++++++++-------------- web_src/js/features/cloudrbanin.js | 26 +++++++++++- 4 files changed, 78 insertions(+), 56 deletions(-) diff --git a/templates/custom/wait_count.tmpl b/templates/custom/wait_count.tmpl index 77c49712d..bef8f1327 100644 --- a/templates/custom/wait_count.tmpl +++ b/templates/custom/wait_count.tmpl @@ -3,13 +3,12 @@ {{$gpuQueue := 0}} {{range $k,$v :=.gpu_types}} {{if eq $k 0}} - {{ $queue := $v.Queue }} + {{ $queue = $v.Queue }} {{ end }} {{ end }} - {{ range $k,$v :=.QueuesDetail }} {{if eq $k $queue}} - {{$gpuQueue :=$v}} + {{$gpuQueue =$v}} {{ end }} {{ end }} {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： {{.TrainJobDuration}} - + + +
@@ -871,24 +871,24 @@ size = size.toFixed(0);//保留的小数位数 return size + unitArr[index]; } - function refreshStatus(version_name) { - $.get(`/api/v1/repos/${userName}/${repoPath}/grampus/train-job/${jobID}?version_name=${version_name}`, (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) - $('#' + version_name + '-ai_center').text(data.AiCenter) - loadLog(version_name) - - - }).fail(function (err) { - console.log(err); - }); - stopBubbling(arguments.callee.caller.arguments[0]) - } + // function refreshStatus(version_name) { + // $.get(`/api/v1/repos/${userName}/${repoPath}/grampus/train-job/${jobID}?version_name=${version_name}`, (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) + // $('#' + version_name + '-ai_center').text(data.AiCenter) + // loadLog(version_name) + + + // }).fail(function (err) { + // console.log(err); + // }); + // stopBubbling(arguments.callee.caller.arguments[0]) + // } function deleteVersion(version_name) { stopBubbling(arguments.callee.caller.arguments[0]) let flag = 1; diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 3936aa620..08208a618 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -270,12 +270,14 @@ {{end}} {{if .CanDel}} - {{$.i18n.Tr "repo.stop"}} + data-jobid="{{.JobID}}" + data-repopath="{{$.RepoRelPath}}/modelarts/train-job" + data-version = "{{.VersionName}}" + >{{$.i18n.Tr "repo.stop"}} {{else}} - {{$.i18n.Tr "repo.stop"}} + {{$.i18n.Tr "repo.stop"}} {{end}} @@ -308,10 +310,9 @@ class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： {{.TrainJobDuration}} - - + + +
@@ -877,28 +878,28 @@ $('#name').val(modelName) $('#version').val("0.0.1") } - function refreshStatus(version_name) { - $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`, (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) - console.log(data) - if (["KILLED", "FAILED", "START_FAILED", "STOPPED", "COMPLETED"].includes(data.JobStatus)) { - $('#' + version_name + '-stop').addClass('disabled') - } - - loadLog(version_name) - - - }).fail(function (err) { - console.log(err); - }); - stopBubbling(arguments.callee.caller.arguments[0]) - } + // function refreshStatus(version_name) { + // $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`, (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) + // console.log(data) + // if (["KILLED", "FAILED", "START_FAILED", "STOPPED", "COMPLETED"].includes(data.JobStatus)) { + // $('#' + version_name + '-stop').addClass('disabled') + // } + + // loadLog(version_name) + + + // }).fail(function (err) { + // console.log(err); + // }); + // stopBubbling(arguments.callee.caller.arguments[0]) + // } function deleteVersion(version_name) { stopBubbling(arguments.callee.caller.arguments[0]) let flag = 1; diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 86e9577b5..95d88fc0b 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -327,6 +327,23 @@ export default async function initCloudrain() { }); } + $(".stop-show-version").click(function (e) { + const ID = this.dataset.jobid; + const repoPath = this.dataset.repopath; + const version_name = this.dataset.version; + const url = `/api/v1/repos/${repoPath}/${ID}/stop_version`; + $.post(url, { version_name: version_name }, (data) => { + if (data.StatusOK === 0) { + $(`#${version_name}-stop`).removeClass("blue"); + $(`#${version_name}-stop`).addClass("disabled"); + refreshStatusShow(version_name, ID, repoPath); + } + }).fail(function (err) { + console.log(err); + }); + e.stopPropagation(); + }); + $("#refresh-status").click(function (e) { let version_name = $(this).data("version"); let ID = $(`#accordion${version_name}`).data("jobid"); @@ -339,11 +356,16 @@ export default async function initCloudrain() { $.get( `/api/v1/repos/${repoPath}/${ID}?version_name=${version_name}`, (data) => { + //accroding下的状态 $(`#${version_name}-status-span span`).text(data.JobStatus); + //accroding下的状态图标 $(`#${version_name}-status-span i`).attr("class", data.JobStatus); + //accroding下的运行时长 $(`#${version_name}-duration-span`).text(data.JobDuration); - $("#" + versionname + "-duration").text(data.JobDuration); - $("#" + versionname + "-status").text(data.JobStatus); + //配置信息详情页的状态 + $(`#${version_name}-status`).text(data.JobStatus); + //配置信息详情页的状态 + $(`#${version_name}-duration`).text(data.JobDuration); } ).fail(function (err) { console.log(err); From a122f0cc4600715b17ad86d51bf9683073cfff20 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 18 Jul 2022 17:28:29 +0800 Subject: [PATCH 2/3] fix issue --- templates/repo/grampus/trainjob/show.tmpl | 57 ----------------------------- templates/repo/modelarts/trainjob/show.tmpl | 34 +---------------- 2 files changed, 1 insertion(+), 90 deletions(-) diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index de57a2978..b4d9495dc 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -871,64 +871,7 @@ size = size.toFixed(0);//保留的小数位数 return size + unitArr[index]; } - // function refreshStatus(version_name) { - // $.get(`/api/v1/repos/${userName}/${repoPath}/grampus/train-job/${jobID}?version_name=${version_name}`, (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) - // $('#' + version_name + '-ai_center').text(data.AiCenter) - // loadLog(version_name) - - - // }).fail(function (err) { - // console.log(err); - // }); - // stopBubbling(arguments.callee.caller.arguments[0]) - // } - function deleteVersion(version_name) { - stopBubbling(arguments.callee.caller.arguments[0]) - let flag = 1; - $('.ui.basic.modal').modal({ - onDeny: function () { - flag = false - }, - onApprove: function () { - $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`, { version_name: version_name }, (data) => { - if (data.VersionListCount === 0) { - location.href = `/${userName}/${repoPath}/modelarts/train-job` - } else { - $('#accordion' + version_name).remove() - } - - }).fail(function (err) { - console.log(err); - }); - flag = true - }, - onHidden: function () { - if (flag == false) { - $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut(); - } - } - }) - .modal('show') - } - function stopVersion(version_name) { - stopBubbling(arguments.callee.caller.arguments[0]) - $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/stop_version`, { version_name: version_name }, (data) => { - if (data.StatusOK === 0) { - $('#' + version_name + '-stop').addClass('disabled') - refreshStatus(version_name) - } - }).fail(function (err) { - console.log(err); - }); - } function loadLog(version_name) { document.getElementById("mask").style.display = "block" $.get(`/api/v1/repos/${userName}/${repoPath}/grampus/train-job/${jobID}/log?version_name=${version_name}&lines=50&order=asc`, (data) => { diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 08208a618..794e42457 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -878,28 +878,6 @@ $('#name').val(modelName) $('#version').val("0.0.1") } - // function refreshStatus(version_name) { - // $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`, (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) - // console.log(data) - // if (["KILLED", "FAILED", "START_FAILED", "STOPPED", "COMPLETED"].includes(data.JobStatus)) { - // $('#' + version_name + '-stop').addClass('disabled') - // } - - // loadLog(version_name) - - - // }).fail(function (err) { - // console.log(err); - // }); - // stopBubbling(arguments.callee.caller.arguments[0]) - // } function deleteVersion(version_name) { stopBubbling(arguments.callee.caller.arguments[0]) let flag = 1; @@ -929,17 +907,7 @@ .modal('show') } - function stopVersion(version_name) { - stopBubbling(arguments.callee.caller.arguments[0]) - $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/stop_version`, { version_name: version_name }, (data) => { - if (data.StatusOK === 0) { - $('#' + version_name + '-stop').addClass('disabled') - refreshStatus(version_name) - } - }).fail(function (err) { - console.log(err); - }); - } + function loadLog(version_name) { $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&lines=50&order=asc`, (data) => { $('input[name=end_line]').val(data.EndLine) From 1beaeeddada314f9c24b109abb9470bc79355e88 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 18 Jul 2022 17:31:18 +0800 Subject: [PATCH 3/3] fix issue --- templates/repo/grampus/trainjob/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index b4d9495dc..53201a467 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -236,7 +236,7 @@ {{range $k ,$v := .version_list_task}}