From e3df303fc468ea3dc693411b8a50ef36628740a1 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 6 Jan 2022 09:56:12 +0800 Subject: [PATCH] fix issue --- options/locale/locale_en-US.ini | 3 ++- options/locale/locale_zh-CN.ini | 7 +++++-- templates/repo/debugjob/index.tmpl | 2 +- templates/repo/modelarts/inferencejob/index.tmpl | 11 ++++++----- templates/repo/modelarts/inferencejob/new.tmpl | 12 ++++++------ templates/repo/modelarts/inferencejob/show.tmpl | 24 +++++++++++++++++------- templates/repo/modelarts/trainjob/index.tmpl | 8 +++++--- templates/repo/modelarts/trainjob/show.tmpl | 2 +- 8 files changed, 43 insertions(+), 26 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4fcee8ecd..ac947320f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -891,7 +891,8 @@ modelarts.train_job_para_admin=train_job_para_admin modelarts.train_job_para.edit=train_job_para.edit modelarts.train_job_para.connfirm=train_job_para.connfirm - +modelarts.infer_job_model = Model +modelarts.infer_job_model_file = Model File modelarts.infer_job = Inference Job modelarts.infer_job.model_version = Model/Version modelarts.infer_job.select_model = Select Model diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 8ab170205..4984cda75 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -841,7 +841,7 @@ modelarts.train_job.new_train=新建训练任务 modelarts.train_job.new_infer=新建推理任务 modelarts.train_job.config=配置信息 modelarts.train_job.new=新建训练任务 -modelarts.train_job.new_place=描述字数不超过256个字符 +modelarts.train_job.new_place=描述字数不超过255个字符 modelarts.model_name=模型名称 modelarts.model_size=模型大小 modelarts.import_model=导入模型 @@ -891,7 +891,7 @@ modelarts.train_job.NAS_mount_path=NAS挂载路径 modelarts.train_job.query_whether_save_parameter=保存作业参数 modelarts.train_job.save_helper=保存当前作业的配置参数，后续您可以使用已保存的配置参数快速创建训练作业。 modelarts.train_job.common_frame=常用框架 -modelarts.train_job.amount_of_compute_node=计算节点个数 +modelarts.train_job.amount_of_compute_node=计算节点数 modelarts.train_job.job_parameter_name=任务参数名称 modelarts.train_job.parameter_description=任务参数描述 modelarts.log=日志 @@ -901,9 +901,12 @@ modelarts.train_job_para_admin=任务参数管理 modelarts.train_job_para.edit=编辑 modelarts.train_job_para.connfirm=确定 +modelarts.infer_job_model = 模型 +modelarts.infer_job_model_file = 模型文件 modelarts.infer_job = 推理任务 modelarts.infer_job.model_version = 模型/版本 modelarts.infer_job.select_model = 选择模型 +modelarts.infer_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。比如inferenece.py、main.py、example/nferenec.py、case/main.py。 model.manage.import_new_model=导入新模型 model.manage.create_error=相同的名称和版本的模型已经存在。 diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index dcd8a3e21..2c97bed56 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -607,7 +607,7 @@ const jobID = job.dataset.jobid; const repoPath = job.dataset.repopath; const computeResource = job.dataset.resource - const initArray = ['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'] + const initArray = ['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED','UNAVAILABLE','DELETED','RESIZE_FAILED'] if (initArray.includes(job.textContent.trim())) { return diff --git a/templates/repo/modelarts/inferencejob/index.tmpl b/templates/repo/modelarts/inferencejob/index.tmpl index a74c0cebf..d2a35d8cb 100644 --- a/templates/repo/modelarts/inferencejob/index.tmpl +++ b/templates/repo/modelarts/inferencejob/index.tmpl @@ -111,7 +111,7 @@
- {{.ModelName}} / {{.ModelVersion}} + {{.ModelName}}/ {{.ModelVersion}}
@@ -145,11 +145,11 @@
{{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.stop"}} {{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}} @@ -232,7 +232,8 @@ function loadJobStatus() { const repoPath = job.dataset.repopath const versionname = job.dataset.version const status_text = $(`#${jobID}-text`).text() - if(['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'].includes(status_text)){ + const finalState = ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED'] + if(finalState.includes(status_text)){ return } $.get(`/api/v1/repos/${repoPath}/modelarts/inference-job/${jobID}?version_name=${versionname}`, (data) => { @@ -243,7 +244,7 @@ function loadJobStatus() { if (status != job.textContent.trim()) { $('#' + jobID+'-icon').removeClass().addClass(status) $('#' + jobID+ '-text').text(status) - + finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled') } }).fail(function(err) { diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl index cd801d9b4..1cc99065b 100644 --- a/templates/repo/modelarts/inferencejob/new.tmpl +++ b/templates/repo/modelarts/inferencejob/new.tmpl @@ -45,7 +45,7 @@
{{template "base/alert" .}}

- {{.i18n.Tr "repo.modelarts.train_job.new"}} + {{.i18n.Tr "repo.modelarts.train_job.new_infer"}}

@@ -65,7 +65,7 @@
   - +
@@ -74,7 +74,7 @@
   - @@ -175,7 +175,6 @@ - 数据集位置存储在环境变量data_url中，推理输出路径存储在环境变量result_url中。
@@ -186,7 +185,7 @@ {{end}} - + 查看样例
@@ -240,6 +239,7 @@
+ 推理输出路径存储在环境变量result_url中。
diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index 375520740..7b383e500 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -214,7 +214,7 @@ td, th {
- + {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} @@ -321,13 +321,23 @@ td, th { - 模型 + {{$.i18n.Tr "repo.modelarts.infer_job_model"}}
名称：testTrainJob1_model_5d21   版本：asdasdasd   - 权重：{{.CkptName}} + +
+ + + + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + +
+ {{.CkptName}}
@@ -439,7 +449,7 @@ td, th { @@ -559,7 +569,7 @@ function renderSize(value){ var srcsize = parseFloat(value); index=Math.floor(Math.log(srcsize)/Math.log(1024)); var size =srcsize/Math.pow(1024,index); - size=size.toFixed(2);//保留的小数位数 + size=size.toFixed(0);//保留的小数位数 return size+unitArr[index]; } function loadModelFile(version_name,parents,filename,init){ @@ -574,7 +584,7 @@ function loadModelFile(version_name,parents,filename,init){ $(`input[name=modelback${version_name}]`).val(version_name) $(`#file_breadcrumb${version_name}`).empty() let htmlBread = "" - htmlBread += `
${version_name}
` + htmlBread += `
result
` htmlBread += "
/
" $(`#file_breadcrumb${version_name}`).append(htmlBread) }else{ diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index b4715a055..a6dcee67b 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -142,11 +142,11 @@
{{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.stop"}} {{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}} @@ -263,7 +263,8 @@ const repoPath = job.dataset.repopath const versionname = job.dataset.version const status_text = $(`#${jobID}-text`).text() - if(['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'].includes(status_text)){ + const finalState = ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED'] + if(finalState.includes(status_text)){ return } $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => { @@ -274,6 +275,7 @@ if (status != job.textContent.trim()) { $('#' + jobID+'-icon').removeClass().addClass(status) $('#' + jobID+ '-text').text(status) + finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled') } diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 0e45317ba..77ba8227a 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -489,7 +489,7 @@ td, th { var srcsize = parseFloat(value); index=Math.floor(Math.log(srcsize)/Math.log(1024)); var size =srcsize/Math.pow(1024,index); - size=size.toFixed(2);//保留的小数位数 + size=size.toFixed(0);//保留的小数位数 return size+unitArr[index]; } function loadJobStatus() {