chenyifan01
|
05413fdb6c
|
#1249
update
|
3 years ago |
chenyifan01
|
fd972635f8
|
#1249
update
|
3 years ago |
chenyifan01
|
34c437c292
|
#1249
update point by resource management
|
3 years ago |
chenyifan01
|
b3f02877f1
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
# Conflicts:
# models/models.go
# modules/cloudbrain/resty.go
# modules/cron/tasks_basic.go
# modules/notification/base/notifier.go
# modules/notification/base/null.go
# modules/notification/notification.go
# modules/setting/setting.go
# options/locale/locale_en-US.ini
# options/locale/locale_zh-CN.ini
# package-lock.json
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
# templates/repo/cloudbrain/benchmark/new.tmpl
# templates/repo/cloudbrain/new.tmpl
# templates/repo/cloudbrain/trainjob/new.tmpl
# templates/repo/modelarts/inferencejob/new.tmpl
# templates/repo/modelarts/notebook/new.tmpl
# templates/repo/modelarts/trainjob/new.tmpl
# web_src/vuepages/components/BaseDialog.vue
# web_src/vuepages/const/index.js
# web_src/vuepages/langs/config/en-US.js
# web_src/vuepages/langs/config/zh-CN.js
# webpack_pro.config.js
|
3 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
|
3 years ago |
ychao_1983
|
372be23544
|
新建gpu调试任务页面排队任务数有时候为空
|
3 years ago |
ychao_1983
|
d2e8036faf
|
fix-2761
|
3 years ago |
chenyifan01
|
03b3efe777
|
#2701
update grampus spec
|
3 years ago |
chenyifan01
|
19603f0fbf
|
#2701
fix bug of restart
|
3 years ago |
ychao_1983
|
84cfc627f5
|
fix-2757
|
3 years ago |
chenyifan01
|
0e4d8844b8
|
#2701
update
|
3 years ago |
chenyifan01
|
2898c40fcc
|
#2701
update
|
3 years ago |
ychao_1983
|
630910604a
|
merge
|
3 years ago |
lewis
|
a32dfa568b
|
fix invalid token
|
3 years ago |
ychao_1983
|
5fad81eca3
|
提交代码
|
3 years ago |
chenyifan01
|
3bb312dd4c
|
#2701
update
|
3 years ago |
zouap
|
aebe308ad0
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
chenyifan01
|
170cbacbf4
|
#2701
update
|
3 years ago |
ychao_1983
|
f8f6c54348
|
Merge pull request '为智算网络用户提供上传工具' (#2726) from fix-2705 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2726
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
|
3 years ago |
zouap
|
a7a4e2c7c7
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
lewis
|
88f5812984
|
debug
|
3 years ago |
ychao_1983
|
be4e51cce0
|
提交代码
|
3 years ago |
zouap
|
dd34e85dec
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
ychao_1983
|
46e97062a2
|
提交代码
|
3 years ago |
ychao_1983
|
a1c59d0a8f
|
提交代码
|
3 years ago |
chenyifan01
|
b897791dec
|
#2712
fix bug
|
3 years ago |
zouap
|
900fd2c7a0
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
chenyifan01
|
295b46c3c4
|
#2631
fix bug
|
3 years ago |
zouap
|
082847bb11
|
修改#2702
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
6b08f66ec9
|
#2624
add SyncResourceSpecs
|
3 years ago |
chenyifan01
|
2e8aa6c97d
|
Merge remote-tracking branch 'origin/V20220815' into fix-2631
|
3 years ago |
chenyifan01
|
a854693c8a
|
#2624
update
|
3 years ago |
chenyifan01
|
9c8e0dacdd
|
#2624
update
|
3 years ago |
chenyifan01
|
892e126a2b
|
#2624
update
|
3 years ago |
zouap
|
0018f529a9
|
Merge branch 'V20220815' into fix502
|
3 years ago |
chenyifan01
|
879d29594c
|
#2631
add cloudbrain task stop template msg
|
3 years ago |
lewis
|
a4b3d325d8
|
Merge branch 'V20220815' of git.openi.org.cn:OpenI/aiforge into fix502
|
3 years ago |
zouap
|
78437402cb
|
Merge remote-tracking branch 'origin/V20220815' into zouap
|
3 years ago |
zouap
|
146f66ea37
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
lewis
|
a667ba8838
|
Merge pull request '几个测试问题修改' (#2669) from fix-2591 into V20220815
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2669
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
ychao_1983
|
e9c394477a
|
markdown显示中文双引号问题还需要修改代码,否则某些场景还是显示成中文双引号
|
3 years ago |
lewis
|
8f65863f55
|
log
|
3 years ago |
lewis
|
1e516cc458
|
debug
|
3 years ago |
zouap
|
bb42d5f319
|
提交代码,解决相关Bug
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
lewis
|
80771f2dd9
|
debug
|
3 years ago |
lewis
|
2567a66f88
|
merge
|
3 years ago |
liuzx
|
571b4138e2
|
删除无用代码
|
3 years ago |
liuzx
|
2bd4299a31
|
merge
|
3 years ago |
liuzx
|
467c8eaa36
|
fix-1968
|
3 years ago |
lewis
|
4895dc4973
|
sync
|
3 years ago |