wangwei
/
aiforge
Not watched
1
0
Fork 0
Code
Releases 128 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

fix issue

tags/v1.21.12.1^2
zhoupzh 4 years ago
parent
b5aa50f097
commit
3ea719e203
10 changed files with 60 additions and 61 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -5
      package-lock.json
  2. +0
    -1
      package.json
  3. +21
    -27
      templates/repo/cloudbrain/index.tmpl
  4. +13
    -2
      templates/repo/cloudbrain/new.tmpl
  5. +3
    -10
      templates/repo/debugjob/index.tmpl
  6. +8
    -11
      templates/repo/modelarts/notebook/index.tmpl
  7. +12
    -2
      templates/repo/modelarts/notebook/new.tmpl
  8. +2
    -2
      templates/repo/modelmanage/index.tmpl
  9. +0
    -1
      web_src/js/index.js
  10. +1
    -0
      web_src/less/_svg.less

+ 0
- 5
package-lock.json View File

@@ -11655,11 +11655,6 @@
"autolinker": "~0.28.0"
}
},
"remixicon": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/remixicon/-/remixicon-2.5.0.tgz",
"integrity": "sha512-q54ra2QutYDZpuSnFjmeagmEiN9IMo56/zz5dDNitzKD23oFRw77cWo4TsrAdmdkPiEn8mxlrTqxnkujDbEGww=="
},
"remove-bom-buffer": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",


+ 0
- 1
package.json View File

@@ -42,7 +42,6 @@
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "4.0.2",
"qs": "6.9.4",
"remixicon": "2.5.0",
"spark-md5": "3.0.1",
"svg-sprite-loader": "5.0.0",
"svgo": "1.3.2",


+ 21
- 27
templates/repo/cloudbrain/index.tmpl View File

@@ -361,19 +361,20 @@
{{end}}

<!-- 调试 -->
{{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
<a id="model-debug-{{.JobID}}" class="ui basic {{if not .CanDebug}}disabled {{else}}blue {{end}}button" href="{{$.Link}}/{{.JobID}}/debug" target="_blank">
{{$.i18n.Tr "repo.debug"}}
{{$.CsrfTokenHtml}}
{{if .CanDebug}}
<a id="model-debug-{{.JobID}}" class="ui basic blue button" href="{{$.Link}}/{{.JobID}}/debug" target="_blank">
{{.CanDebug}}{{$.i18n.Tr "repo.debug"}}
</a>
{{else}}
<a class="ui basic disabled button" href="{{$.Link}}/{{.JobID}}/debug" target="_blank">
<a class="ui basic disabled button">
{{$.i18n.Tr "repo.debug"}}
</a>
{{end}}
<!-- 停止 -->
<form id="stopForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/stop" method="post" style="margin-left:-1px;">
{{$.CsrfTokenHtml}}
{{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
{{if .CanDel}}
<a id="stop-model-debug-{{.JobID}}" class="ui basic {{if or (eq .Status "STOPPED") (eq .Status "FAILED")}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
{{$.i18n.Tr "repo.stop"}}
</a>
@@ -402,13 +403,13 @@
<!-- 删除任务 -->
<form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
{{$.CsrfTokenHtml}}
{{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
<a id="model-delete-{{.JobID}}" class="ui basic button {{if not .CanDel}}disabled {{else}} blue {{end}}" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.delete"}}
{{if .CanDel}}
<a id="model-delete-{{.JobID}}" class='ui basic button {{if eq .Status "STOPPED" "FAILED"}}blue{{else}}disabled{{end}}' onclick="assertDelete(this)" style="border-radius: .28571429rem;">
{{.CanDel}}{{$.i18n.Tr "repo.delete"}}
</a>
{{else}}
<a class="ui basic blue button disabled" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.delete"}}
<a class="ui basic button disabled" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.delete"}}
</a>
{{end}}
</form>
@@ -417,7 +418,6 @@
<!-- 镜像列表弹窗 -->
<div id="imageModal" class="modal" style="display: none;">
<div class="modal-content">

<!-- 表格 -->
<div class="ui form">
<form id="commitImageForm" action="{{$.Link}}/{{.JobID}}/commit_image" method="post" target="iframeContent">
@@ -426,21 +426,16 @@
<p style="display: inline;">提交任务镜像</p>
<span class="close">&times;</span>
</div>
<div class="ui divider"></div>
<div class="inline required field dis">
<label>镜像标签：</label>
<input name="tag" id="image_tag" tabindex="3" autofocus required maxlength="254" style="width:75%">
</div>
<div class="inline field">
<label class="label_after">镜像描述：</label>
<textarea name="description" maxlength="254" rows="8" style="width:75%;margin-left: 0.2em;"></textarea>
</div>
<div class="ui divider"></div>
<div class="inline field">
<label></label>
<button class="ui green button" onclick="showmask()">
@@ -449,13 +444,8 @@
</div>
</form>
</div>
</div>
</div>



</div>
</div>
{{end}} {{template "base/paginate" .}}
@@ -558,12 +548,16 @@
//}
}
if(status==="RUNNING"){
console.log("----------",status,$('#model-debug-'+jobID))
$('#model-debug-'+jobID).removeClass('disabled')
$('#model-debug-'+jobID).addClass('blue')
$('#model-image-'+jobID).removeClass('disabled')
$('#model-image-'+jobID).addClass('blue')

}
if(status==="STOPPED" || status==="FAILED"){
$('#model-delete-'+jobID).removeClass('disabled')
$('#model-delete-'+jobID).addClass('blue')
}
if(status!=="RUNNING"){
$('#model-debug-'+jobID).removeClass('blue')
@@ -575,14 +569,14 @@
if(status!=="STOPPED" || status!=="FAILED"){
$('#stop-model-debug-'+jobID).removeClass('disabled')
$('#stop-model-debug-'+jobID).addClass('blue')
$('#model-delete-'+jobID).removeClass('red')
$('#model-delete-'+jobID).addClass('disabled')
// $('#model-delete-'+jobID).removeClass('red')
// $('#model-delete-'+jobID).addClass('disabled')
}
if(status=="STOPPED" || status=="FAILED"){
$('#stop-model-debug-'+jobID).removeClass('blue')
$('#stop-model-debug-'+jobID).addClass('disabled')
$('#model-delete-'+jobID).removeClass('disabled')
$('#model-delete-'+jobID).addClass('red')
// $('#model-delete-'+jobID).removeClass('disabled')
// $('#model-delete-'+jobID).addClass('red')
}
}).fail(function(err) {
console.log(err);


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

@@ -132,8 +132,19 @@
<div class="inline required field">
<label>计算资源</label>
<div class="ui blue small menu compact selectcloudbrain">
<a class="active item" href="{{.RepoLink}}/cloudbrain/create"><i class="ri-home-line"></i>CPU/GPU</a>
<a class="item" href="{{.RepoLink}}/modelarts/notebook/create"><i class="ri-home-line"></i>Ascend NPU</a>
<a class="active item" href="{{.RepoLink}}/cloudbrain/create">
<svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
</svg>
CPU/GPU
</a>
<a class="item" href="{{.RepoLink}}/modelarts/notebook/create">
<svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
</svg>
Ascend NPU</a>
</div>
</div>
<div class="inline required field">


+ 3
- 10
templates/repo/debugjob/index.tmpl View File

@@ -354,7 +354,6 @@
<a class="imageBtn ui basic disabled button" style="{{if eq .ComputeResource "CPU/GPU"}} visibility: visible {{else}} visibility: hidden{{end}}" value="{{.CanDebug}}">{{$.i18n.Tr "repo.submit_image"}}</a>
{{end}}
</div>
{{.CanDel}}
<!-- 删除任务 -->
<form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/del" method="post">
<input type="hidden" name="debugListType" value="all">
@@ -368,10 +367,7 @@
<a class="ui basic button disabled" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.delete"}}
</a>
<<<<<<< HEAD
=======
>>>>>>> V20211213
{{end}}
</form>
@@ -418,10 +414,7 @@
</div>
</div>
</div>
<<<<<<< HEAD
{{end}}
=======
>>>>>>> V20211213
</div>
</div>
</div>
@@ -527,11 +520,11 @@
// $('#model-delete-'+jobID).removeClass('red')
// $('#model-delete-'+jobID).addClass('disabled')
}
if(status=="STOPPED" || status=="FAILED"){
if(status=="STOPPED" || status=="FAILED" || status=="STOPPING"){
$('#stop-model-debug-'+jobID).removeClass('blue')
$('#stop-model-debug-'+jobID).addClass('disabled')
$('#model-delete-'+jobID).removeClass('disabled')
$('#model-delete-'+jobID).addClass('red')
// $('#model-delete-'+jobID).removeClass('disabled')
// $('#model-delete-'+jobID).addClass('red')
}
}).fail(function(err) {
console.log(err);


+ 8
- 11
templates/repo/modelarts/notebook/index.tmpl View File

@@ -190,7 +190,7 @@
<form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
{{$.CsrfTokenHtml}}
{{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
<a id="model-delete-{{.JobID}}" class="ui basic button {{if eq .Status "RUNNING" "CREATING" "WAITING" "STARTING" "STOPPING" }}disabled {{else}} blue {{end}}" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
<a id="model-delete-{{.JobID}}" class="ui basic button blue" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
{{$.i18n.Tr "repo.delete"}}
</a>
{{else}}
@@ -294,16 +294,15 @@
$('#' + jobID+'-icon').removeClass().addClass(status)
$('#' + jobID+ '-text').text(status)
//if (status == 'STOPPED') {
// window.location.reload()
//}
}
if(status==="RUNNING"){
$('#model-debug-'+jobID).removeClass('disabled')
$('#model-debug-'+jobID).addClass('blue')

}
if(["CREATING","STOPPING","STARTING"].includes(status)){
$('#model-delete-'+jobID).removeClass('blue')
$('#model-delete-'+jobID).addClass('disabled')
}
if(status!=="RUNNING"){
$('#model-debug-'+jobID).removeClass('blue')
@@ -316,17 +315,15 @@
// $('#model-delete-'+jobID).removeClass('red')
// $('#model-delete-'+jobID).addClass('disabled')
}
if(status=="STOPPED" || status=="FAILED" ){
if(status=="STOPPED" || status=="FAILED" || status=="STOPPING"){
$('#stop-model-debug-'+jobID).removeClass('blue')
$('#stop-model-debug-'+jobID).addClass('disabled')
$('#model-delete-'+jobID).removeClass('disabled')
$('#model-delete-'+jobID).addClass('red')
}
if(status=="START_FAILED"){
$('#stop-model-debug-'+jobID).removeClass('blue')
$('#stop-model-debug-'+jobID).addClass('disabled')
$('#model-delete-'+jobID).removeClass('disabled')
$('#model-delete-'+jobID).addClass('red')
// $('#model-delete-'+jobID).removeClass('disabled')
// $('#model-delete-'+jobID).addClass('red')
}
}).fail(function(err) {
console.log(err);


+ 12
- 2
templates/repo/modelarts/notebook/new.tmpl View File

@@ -32,8 +32,18 @@
<div class="inline required field">
<label>计算资源</label>
<div class="ui blue small menu compact selectcloudbrain">
<a class="item" href="{{.RepoLink}}/cloudbrain/create">CPU/GPU</a>
<a class="active item" href="{{.RepoLink}}/modelarts/notebook/create">Ascend NPU</a>
<a class="item" href="{{.RepoLink}}/cloudbrain/create">
<svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
</svg>
CPU/GPU</a>
<a class="active item" href="{{.RepoLink}}/modelarts/notebook/create">
<svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
</svg>
Ascend NPU</a>
</div>
</div>
<div class="inline required field">


+ 2
- 2
templates/repo/modelmanage/index.tmpl View File

@@ -63,11 +63,11 @@
<div id="deletemodel">
<div class="ui basic modal first">
<div class="ui icon header">
<i class="trash icon"></i> 删除任务
<i class="trash icon"></i> 删除模型
</div>

<div class="content">
<p>你确认删除该任务么？此任务一旦删除不可恢复。</p>
<p>你确认删除该模型么？此模型一旦删除不可恢复。</p>
</div>
<div class="actions">
<div class="ui red basic inverted cancel button">


+ 0
- 1
web_src/js/index.js View File

@@ -8,7 +8,6 @@ import './features/letteravatar.js'
import Vue from 'vue';
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import 'remixicon/fonts/remixicon.css';
import axios from 'axios';
import qs from 'qs';
import 'jquery.are-you-sure';


+ 1
- 0
web_src/less/_svg.less View File

@@ -2,6 +2,7 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
margin-right: 5px;

.middle & {
vertical-align: middle;


Write Preview
Loading…
Cancel
Save