chenyifan01
|
683b8bc066
|
Merge remote-tracking branch 'origin/V20220908' into point-v2
|
3 years ago |
chenyifan01
|
b0a12f43f0
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
# Conflicts:
# models/cloudbrain.go
# options/locale/locale_en-US.ini
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
# templates/repo/cloudbrain/benchmark/new.tmpl
# templates/repo/cloudbrain/inference/new.tmpl
# templates/repo/cloudbrain/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/notebook/new.tmpl
# templates/repo/modelarts/trainjob/new.tmpl
# templates/repo/modelarts/trainjob/version_new.tmpl
# web_src/js/standalone/specsuse.js
|
3 years ago |
zouap
|
2f49112028
|
恢复重定向的方式输出日志。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
188556db15
|
恢复重定向的方式输出日志。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
6e5be3d93b
|
Merge remote-tracking branch 'origin/V20220908' into fix-2805
|
3 years ago |
chenyifan01
|
2d8f18129b
|
#2701
update
|
3 years ago |
chenyifan01
|
c5e0971655
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
# Conflicts:
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
|
3 years ago |
lewis
|
5969cce70e
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
3 years ago |
lewis
|
a1c5dfa246
|
Merge pull request 'issue 2840' (#2842) from V20220830.patch into V20220908
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2842
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
ychao_1983
|
543ab98fe9
|
支持给指定组织定制节点数
|
3 years ago |
lewis
|
6ab10babca
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
3 years ago |
zouap
|
1d64c9bcff
|
#2833 需求开发。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
3 years ago |
chenyifan01
|
6c85bacd74
|
#1249
update
|
3 years ago |
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
|
8c3064b85f
|
#2805
update
|
3 years ago |
chenyifan01
|
b69d18290e
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
# Conflicts:
# templates/repo/modelarts/notebook/show.tmpl
|
3 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>
|
3 years ago |
ychao_1983
|
a0f2f7f5b6
|
fix-2751
|
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 |
lewis
|
a4d8e34178
|
Merge branch 'V20220830' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
3 years ago |
chenyifan01
|
a692651642
|
Merge remote-tracking branch 'origin/V20220830' into res-manage
# Conflicts:
# models/models.go
# modules/cron/tasks_basic.go
|
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 |
lewis
|
e92d948822
|
cd notebook
|
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 |
lewis
|
cdae759a09
|
init
|
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 |