chenyifan01
|
d857bdce76
|
Merge remote-tracking branch 'origin/res-manage' into res-manage-v2
|
2 years ago |
chenshihai
|
a7fe28d261
|
update
|
2 years ago |
chenyifan01
|
be59a28b92
|
Merge remote-tracking branch 'origin/res-manage-v2' into res-manage-v2
|
2 years ago |
chenyifan01
|
7bd08b5983
|
Merge remote-tracking branch 'origin/res-manage' into res-manage-v2
|
2 years ago |
chenshihai
|
ed7405897f
|
update resources management
|
2 years ago |
chenyifan01
|
b0d19cedc3
|
#2701
update
|
2 years ago |
chenyifan01
|
a24423d80b
|
#2701
show spec is available or not
|
2 years ago |
chenyifan01
|
8afc0560ff
|
#2701
show spec is available or not
|
2 years ago |
chenshihai
|
6a618fae18
|
更新训练启智NPU修改任务新建页
|
2 years ago |
chenyifan01
|
b69d18290e
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
# Conflicts:
# templates/repo/modelarts/notebook/show.tmpl
|
2 years ago |
lewis
|
7de1c4babe
|
Merge pull request 'fix-2751' (#2794) from fix-2392 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2794
Reviewed-by: lewis <747342561@qq.com>
|
2 years ago |
ychao_1983
|
a0f2f7f5b6
|
fix-2751
|
2 years ago |
chenshihai
|
f83a9941be
|
Merge pull request 'fix-issue 删除console打印信息和修改中英文翻译' (#2793) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2793
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
2 years ago |
zhoupzh
|
37d975c4ba
|
Merge branch 'V20220830' into fix-2764
|
2 years ago |
zhoupzh
|
c01a2db0fe
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
2 years ago |
zhoupzh
|
c0b34f910b
|
fix issue
|
2 years ago |
lewis
|
0217d00dcc
|
Merge pull request 'fix-2788 可选关联数据集过滤掉本项目数据集' (#2792) from fix-2392 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2792
Reviewed-by: lewis <747342561@qq.com>
|
2 years ago |
zhoupzh
|
35b77832be
|
Merge branch 'V20220830' into fix-2764
|
2 years ago |
zhoupzh
|
b7fa0c58d9
|
fix issue
|
2 years ago |
zhoupzh
|
7799ab2178
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
2 years ago |
zhoupzh
|
f5803bc06f
|
fix issue
|
2 years ago |
ychao_1983
|
d7007c9bb8
|
fix-2788
|
2 years ago |
lewis
|
85341db8d8
|
Merge pull request '资源管理一期' (#2780) from res-manage into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2780
Reviewed-by: lewis <747342561@qq.com>
|
2 years ago |
chenshihai
|
fb76bb1810
|
Merge pull request '解决关联数据集checkbox点击两下取消的问题和复制的id' (#2790) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2790
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
2 years ago |
zhoupzh
|
38362813fa
|
Merge branch 'V20220830' into fix-2764
|
2 years ago |
zhoupzh
|
83d1513b1f
|
fix issue
|
2 years ago |
zhoupzh
|
b0813c9e8e
|
fix issue
|
2 years ago |
lewis
|
55f195e045
|
Merge pull request '检测用户是否有运行中的任务时,增加stopping状态' (#2783) from fix-2643 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2783
Reviewed-by: lewis <747342561@qq.com>
|
2 years ago |
chenyifan01
|
57ec2f0442
|
Merge branch 'res-manage' into res-manage-v2
# Conflicts:
# models/models.go
|
2 years ago |
chenyifan01
|
3896459ed0
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
|
2 years ago |
chenyifan01
|
e636f73da7
|
Merge remote-tracking branch 'origin/res-manage-v2' into res-manage-v2
|
2 years ago |
chenyifan01
|
525e3e941f
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
|
2 years ago |
chenshihai
|
68eb424847
|
Merge pull request 'fix-2764' (#2782) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2782
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
2 years ago |
chenshihai
|
817ceb8d6c
|
update dir tips
|
2 years ago |
zhoupzh
|
425b786bf3
|
fix issue
|
2 years ago |
zhoupzh
|
53d66135fc
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
2 years ago |
zhoupzh
|
4225ac6544
|
fix issue
|
2 years ago |
liuzx
|
29b966c0a4
|
Merge branch 'V20220830' into fix-2643
|
2 years ago |
zhoupzh
|
6b0637b3d9
|
Merge branch 'V20220830' into fix-2764
|
2 years ago |
zhoupzh
|
bf947055e2
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
2 years ago |
zhoupzh
|
960bbede5c
|
fix issue
|
2 years ago |
liuzx
|
69b31dc48e
|
add stopping status
|
2 years ago |
zhoupzh
|
9fb4f9a63c
|
fix issue
|
2 years ago |
chenyifan01
|
a692651642
|
Merge remote-tracking branch 'origin/V20220830' into res-manage
# Conflicts:
# models/models.go
# modules/cron/tasks_basic.go
|
2 years ago |
chenyifan01
|
8681fbd34b
|
#2701
update
|
2 years ago |
chenshihai
|
35d77af012
|
Resources Management
|
2 years ago |
liuzx
|
efad47bf8d
|
add sleeptime when delete cloudbrain task
|
2 years ago |
chenyifan01
|
0f2d6fce05
|
#2701
update
|
2 years ago |
chenyifan01
|
1f20f81235
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
# Conflicts:
# models/cloudbrain.go
# models/models.go
# modules/cron/tasks_basic.go
# modules/modelarts/modelarts.go
# routers/repo/grampus.go
# routers/repo/modelarts.go
# templates/repo/cloudbrain/inference/new.tmpl
# templates/repo/cloudbrain/trainjob/new.tmpl
# templates/repo/grampus/trainjob/gpu/new.tmpl
# templates/repo/grampus/trainjob/npu/new.tmpl
# templates/repo/modelarts/inferencejob/new.tmpl
# templates/repo/modelarts/trainjob/new.tmpl
|
2 years ago |
chenshihai
|
78bb7a6d5b
|
Merge pull request '关联数据集阻止事件冒泡和样式修改' (#2778) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2778
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
2 years ago |