Browse Source

fix issue

pull/1276/head
zhoupzh 3 years ago
parent
commit
69ce6a844d
4 changed files with 31 additions and 16 deletions
  1. +1
    -1
      options/locale/locale_zh-CN.ini
  2. +5
    -3
      templates/repo/modelarts/inferencejob/index.tmpl
  3. +25
    -11
      templates/repo/modelarts/inferencejob/new.tmpl
  4. +0
    -1
      templates/repo/modelmanage/index.tmpl

+ 1
- 1
options/locale/locale_zh-CN.ini View File

@@ -793,7 +793,7 @@ debug=调试
debug_again=再次调试
stop=停止
delete=删除
model_download=模型下载
model_download=结果下载
submit_image=提交镜像
download=模型下载



+ 5
- 3
templates/repo/modelarts/inferencejob/index.tmpl View File

@@ -53,7 +53,9 @@
{{if $.RepoIsEmpty}}
<div class="bgtask-content-txt">代码版本:您还没有初始化代码仓库,请先<a href="{{.RepoLink}}">创建代码版本;</a></div>
{{end}}
<div class="bgtask-content-txt">模型文件:您还没有模型文件,请先通过训练任务产生并导出模型;</div>
{{if eq 0 $.MODEL_COUNT}}
<div class="bgtask-content-txt">模型文件:您还没有模型文件,请先通过<a href="{{.RepoLink}}/modelarts/train-job">训练任务</a>产生并 <a href="{{.RepoLink}}/modelmanage/show_model">导出模型</a> ;</div>
{{end}}
<div class="bgtask-content-txt">数据集:云脑1提供 CPU / GPU 资源,云脑2提供 Ascend NPU 资源,调试使用的数据集也需要上传到对应的环境;</div>
<div class="bgtask-content-txt">使用说明:可以参考启智AI协作平台<a href="https://git.openi.org.cn/zeizei/OpenI_Learning">小白训练营课程。</a></div>
</div>
@@ -158,11 +160,11 @@
{{$.CsrfTokenHtml}}
{{if .CanModify}}
<a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="model-download-{{.JobID}}" href="{{$.RepoLink}}/modelarts/inference-job/{{.JobID}}/downloadall?version_name={{.VersionName}}" class="ui basic blue button" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.download"}}
{{$.i18n.Tr "repo.model_download"}}
</a>
{{else}}
<a style="padding: 0.5rem 1rem;margin-left:0.2rem" class="ui basic button disabled" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.download"}}
{{$.i18n.Tr "repo.model_download"}}
</a>
{{end}}
</div>


+ 25
- 11
templates/repo/modelarts/inferencejob/new.tmpl View File

@@ -59,7 +59,7 @@
<h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:</h4>
<div class="required unite min_title inline field">
<label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
<input style="width: 60%;" name="job_name" id="trainjob_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.job_name}}" tabindex="3" autofocus required maxlength="254">
<input style="width: 60%;" name="job_name" id="trainjob_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.job_name}}" tabindex="3" autofocus required maxlength="36">
<span class="tooltips" style="display: block;">请输入只包含大小写字母、数字、_和-,最长36个字符。</span>
</div>
@@ -80,9 +80,8 @@
<div class="text">{{$.model_name}}</div>
{{else}}
<input type="hidden" name="model_name" required>
<div class="default text">选择项目下的模型</div>
<div class="text"></div>
{{end}}
<i class="dropdown icon"></i>
<div class="menu" id="model_name">
</div>
@@ -95,7 +94,7 @@
<div class="text">{{$.model_version}}</div>
{{else}}
<input type="hidden" name="train_url" required>
<div class="default text">选择版本</div>
<div class="text"></div>
{{end}}
<i class="dropdown icon"></i>
<div class="menu" id="model_name_version">
@@ -110,7 +109,7 @@
<div class="text">{{$.ckpt_name}}</div>
{{else}}
<input type="hidden" name="ckpt_name" required>
<div class="default text">选择模型.ckpt文件</div>
<div class="text"></div>
{{end}}
<i class="dropdown icon"></i>
<div class="menu" id="model_checkpoint">
@@ -269,25 +268,31 @@
nameList.forEach(element => {
html += `<div class="item" data-value=${element}>${element}</div>`
});
const initModelVersion = nameMap[nameList[0]][0]
const initTrainTaskInfo = JSON.parse(initModelVersion.TrainTaskInfo)
$('#model_name').append(html)
$('#select_model').removeClass("loading")

$("#select_model").dropdown('set text',nameList[0])
$("#select_model").dropdown('set value',nameList[0],nameList[0])
})
// 根据选中的模型名称获取相应的模型版本
$(function(){
$('#select_model').dropdown({
onChange: function(value, text, $selectedItem) {
console.log(nameMap)
$("#select_model_version").addClass("loading")
$('#model_name_version').empty()
let html = ''
nameMap[value].forEach(element => {
let {TrainTaskInfo} = element
console.log("element",element)
TrainTaskInfo = JSON.parse(TrainTaskInfo)
html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${TrainTaskInfo.TrainUrl}">${element.Version}</div>`
});
$('#model_name_version').append(html)
$("#select_model_version").removeClass("loading")
const initVersionText = $('#model_name_version div.item:first-child').text()
const initVersionValue = $('#model_name_version div.item:first-child').data('value')
$("#select_model_version").dropdown('set text',initVersionText)
$("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child'))
}
})
})
@@ -295,19 +300,28 @@
$(function(){
$('#select_model_version').dropdown({
onChange: function(value, text, $selectedItem) {
console.log(value,text,$selectedItem)
const dataID = $selectedItem[0].getAttribute("data-id")
const label = $selectedItem[0].getAttribute("data-label")
console.log("label",label)
$("#select_model_checkpoint").addClass("loading")
$("#model_checkpoint").empty()
let html = ''
loadCheckpointList(dataID).then((res)=>{
res.forEach(element => {
html += `<div class="item" data-value=${element.FileName}>${element.FileName}</div>`
const ckptSuffix = element.FileName.split(".")
if(!element.IsDir && ckptSuffix[ckptSuffix.length-1]==='ckpt'){
html += `<div class="item" data-value=${element.FileName}>${element.FileName}</div>`
}
})
$('#model_checkpoint').append(html)
$("#select_model_checkpoint").removeClass("loading")
const initVersionText = $('#model_checkpoint div.item:last-child').text()
const initVersionValue = $('#model_checkpoint div.item:last-child').data('value')
$("#select_model_checkpoint").dropdown('set text',initVersionText)
$("#select_model_checkpoint").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child'))
})

$("input#ai_model_version").val(text)
$("input#ai_model_label").val(label)
}


+ 0
- 1
templates/repo/modelmanage/index.tmpl View File

@@ -154,7 +154,6 @@
{{template "base/footer" .}}

<script>
console.log({{.MODEL_COUNT}})
let repolink = {{.RepoLink}}
let repoId = {{$repository}}
const {_AppSubUrl, _StaticUrlPrefix, csrf} = window.config;


Loading…
Cancel
Save