From 90a387f470fdd989d526c7ce219fec760f6f9172 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 11:55:28 +0800 Subject: [PATCH 01/17] fix issue --- templates/repo/modelarts/trainjob/show.tmpl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 580940289..f22a2ce56 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -487,8 +487,8 @@
- - {{$.i18n.Tr "repo.modelarts.download_log"}} @@ -734,6 +734,12 @@ // 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}-log-down`).removeClass('disabled').addClass('ti-download-file') + $('#' + version_name + '-stop').addClass('disabled') + } + loadLog(version_name) From 9d45a49e73379caa1b0877438b9bf7e01d7a5dbd Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 15:11:32 +0800 Subject: [PATCH 02/17] fix issue --- web_src/js/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index cab488167..8fe201192 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1214,7 +1214,7 @@ async function initRepository() { files: $attachments }, (data) => { - if (data.length === 0) { + if (data.length === 0 || data.content === '') { $renderContent.html($('#no-content').html()); } else { $renderContent.html(data.content); @@ -1225,7 +1225,7 @@ async function initRepository() { let imageShow = '' const $content = $segment.parent(); if (!$content.find('.ui.small.images').length) { - if (data.attachments !== '') { + if (data.attachments !== '' && data.attachments) { if ($content.find('.ui.middle.aligned').length === 0) { imageShow += '
' imageShow += '
' From 08ac73327a58a4ef1f847267a74f946f38750c68 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 15:42:18 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8D=A0=E7=94=A8?= =?UTF-8?q?=E6=83=85=E5=86=B5=E6=98=BE=E7=A4=BA-1=E7=9A=84=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index c51f6638e..49cfb2132 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -5125,7 +5125,6 @@ function initChartsNpu() { }; $('.metric_chart').click(function (e) { let versionName = $(this).data('version') - console.log("11111", versionName) let myCharts = echarts.init(document.getElementById(`metric-${versionName}`)) $.get(`${window.config.AppSubUrl}/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/metric_statistics?version_name=${versionName}&statistic_type=each`, (res) => { let filterDta = res.MetricsInfo.filter((item) => { @@ -5136,6 +5135,7 @@ function initChartsNpu() { return item.metric }) let seriesData = filterDta.map((item) => { + let value = item.value.map((item) => { return item > 0 ? item : '0' }) let seriesOption = { name: item.metric, type: 'line', @@ -5149,12 +5149,11 @@ function initChartsNpu() { shadowBlur: 10, shadowOffsetY: 8 }, - data: item.value + data: value } return seriesOption }) let xLength = res.MetricsInfo[0].value.length - console.log(legenData) options.xAxis.data = Array.from({ length: xLength }, (_, index) => index + 1) options.legend.data = legenData options.series = seriesData From f5d40b3f92f3455699084d86a200d185f0c87ea6 Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 14 Jun 2022 15:58:01 +0800 Subject: [PATCH 04/17] fix-2151 --- options/locale/locale_zh-CN.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 440f6746a..9ba722409 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1194,7 +1194,7 @@ template.topics=主题 template.avatar=头像 template.issue_labels=任务标签 template.one_item=必须至少选择一个模板项 -template.one_promise=创建项目需承诺使用协议！ +template.one_promise=创建项目时需承诺遵守使用协议 template.invalid=必须选择一个模板项目 template.repo_adress=项目地址 template.repo_path=项目地址 From 8a9a2fa3b448e9c2f07eb4cbf33c6271a785495a Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Tue, 14 Jun 2022 16:27:42 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/dataset.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 9d7f4a4d7..05a89964f 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -173,7 +173,7 @@ func DatasetIndex(ctx *context.Context) { uploader, _ := models.GetUserByID(attachment.UploaderID) attachment.Uploader = uploader if !strings.HasSuffix(attachment.Name, ".zip") { - attachment.DecompressState = 3 //非zip文件 + attachment.DecompressState = -1 //非zip文件 } } From a244126537b8bc6da2d2c0a6589dcd12d7300776 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 16:33:48 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=A7=A3=E5=8E=8B=E7=8A=B6=E6=80=81=E4=B8=BA0?= =?UTF-8?q?=E6=88=96=E8=80=852?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/datasets/index.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 9a8f2aaea..178253199 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -279,7 +279,7 @@
- {{if ne .DecompressState 3}}{{$.i18n.Tr "dataset.unzip_status"}}：{{if eq .DecompressState 1}}{{$.i18n.Tr "dataset.unzip_successed"}}{{else if eq .DecompressState 0}}{{$.i18n.Tr "dataset.unzip_stared"}}{{else}}{{$.i18n.Tr "dataset.unzip_failed"}}{{end}} + {{if ne .DecompressState -1}}{{$.i18n.Tr "dataset.unzip_status"}}：{{if eq .DecompressState 1}}{{$.i18n.Tr "dataset.unzip_successed"}}{{else if eq .DecompressState 0 2}}{{$.i18n.Tr "dataset.unzip_stared"}}{{else}}{{$.i18n.Tr "dataset.unzip_failed"}}{{end}}   {{end}}{{$.i18n.Tr "dataset.download"}}：{{.DownloadCount}} {{if .Description}}  {{$.i18n.Tr "dataset.description"}}：{{.Description}}{{end}} @@ -288,10 +288,10 @@ {{if eq .DecompressState 1}} - {{else if eq .DecompressState 0}} + {{else if eq .DecompressState 0 2}} - {{else if eq .DecompressState 2}} + {{else if eq .DecompressState 3}} {{else}} From 70c25399ae6df0d8511a8b93b948ec085fef09d1 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 16:39:29 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BD=BF=E7=94=A8=E5=8D=8F=E8=AE=AE=E6=96=B0?= =?UTF-8?q?=E5=BC=80=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/create.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 6b9e5c877..773f398f2 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -155,7 +155,8 @@ {{.i18n.Tr "repo.openi_use_agreement"}} + {{.i18n.Tr "repo.openi_use_agreement"}}
From 10149225bafec0e227887a02285fd944a109909b Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 14 Jun 2022 17:15:17 +0800 Subject: [PATCH 08/17] fix issue --- web_src/js/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index a6645d7cd..11bb9835d 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -5119,8 +5119,7 @@ function initChartsNpu() { name: '时间(min)' }, yAxis: { - min: 0, - max: 100, + show: true, name: '占有率(%)', axisLine: { @@ -5162,7 +5161,7 @@ function initChartsNpu() { return seriesOption }) let xLength = res.MetricsInfo[0].value.length - options.xAxis.data = Array.from({ length: xLength }, (_, index) => index + 1) + options.xAxis.data = Array.from({ length: xLength }, (_, index) => index) options.legend.data = legenData options.series = seriesData options && myCharts.setOption(options); From de635ae6892593314a87dc95fa23c6b04e26f3ce Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 17:22:53 +0800 Subject: [PATCH 09/17] fix issue --- templates/repo/datasets/index.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 9a8f2aaea..7629d4bdc 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -11,7 +11,7 @@ .dataset_title { font-size: 14px; - max-width: 80%; + /* max-width: 80%; */ display: inline-block !important; margin-left: 6px !important; padding-right: 0 !important; From fcaa00a72765193e7f3d187ddd70a0677ff4e31c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 14 Jun 2022 18:28:49 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=8F=AA=E7=95=99=E6=9C=80=E5=A4=9A?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/explore/datasets.tmpl | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 7274ef64c..0cfe1fd18 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -157,8 +157,6 @@ href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}} {{.i18n.Tr "repo.issues.filter_sort.mostusecount"}} - {{.i18n.Tr "repo.issues.filter_sort.fewestusecount"}}
From b2a3a70cb2aa51d9e2dffb144fbd17aade3674ff Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 15 Jun 2022 09:33:51 +0800 Subject: [PATCH 11/17] fix issue --- templates/explore/datasets.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 0cfe1fd18..327c4fb98 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -199,7 +199,7 @@ {{else}} + style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;font-size: 12px;font-weight: normal;flex: 1;margin-left: 1.5rem;">
Date: Wed, 15 Jun 2022 09:53:05 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/modelmanage/showinfo.tmpl | 2 +- web_src/js/components/Model.vue | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 016aa4951..dc004c45e 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1092,6 +1092,7 @@ modelarts.train_job.fast_parameter_setting_config_link=fast_parameter_setting_co modelarts.train_job.frames=frames modelarts.train_job.algorithm_origin=Algorithm Origin modelarts.train_job.AI_driver=AI Engine +modelarts.train_job.AI_Engine=AI Engine modelarts.train_job.start_file=Start File modelarts.train_job.boot_file_helper=The startup file is the entry file that your program executes, and it must be a file ending in .py modelarts.train_job.dataset=Dataset diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 440f6746a..36fdc804a 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1102,6 +1102,7 @@ modelarts.train_job.fast_parameter_setting_config_link=这里 modelarts.train_job.frames=常用框架 modelarts.train_job.algorithm_origin=算法来源 modelarts.train_job.AI_driver=AI引擎 +modelarts.train_job.AI_Engine=模型框架 modelarts.train_job.start_file=启动文件 modelarts.train_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。比如train.py、main.py、example/train.py、case/main.py。 modelarts.train_job.boot_file_place=填写启动文件路径，默认为train.py diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl index 0de4e043b..bb4807c07 100644 --- a/templates/repo/modelmanage/showinfo.tmpl +++ b/templates/repo/modelmanage/showinfo.tmpl @@ -141,7 +141,7 @@ - {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} + {{$.i18n.Tr "repo.modelarts.train_job.AI_Engine"}} diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue index d9672214c..801ca8805 100644 --- a/web_src/js/components/Model.vue +++ b/web_src/js/components/Model.vue @@ -60,7 +60,7 @@ From e1acb6777b1478a08ce258332ade5fdb78802207 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 15 Jun 2022 10:16:52 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/modelmanage/index.tmpl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl index 0c5cd5547..ec96606b9 100644 --- a/templates/repo/modelmanage/index.tmpl +++ b/templates/repo/modelmanage/index.tmpl @@ -1,5 +1,10 @@ {{template "base/head" .}} +
@@ -135,7 +140,7 @@