lewis
|
a3b1c7df89
|
Merge branch 'V20220926' of git.openi.org.cn:OpenI/aiforge into grampus-storage
|
2 years ago |
lewis
|
319231d579
|
grampus-storage
|
2 years ago |
chenyifan01
|
6886ff870e
|
Merge remote-tracking branch 'origin/V20220926' into point-v2
|
2 years ago |
chenyifan01
|
febd5f4359
|
#1249
update
|
2 years ago |
ychao_1983
|
ee033ea507
|
提交代码
|
2 years ago |
chenyifan01
|
2e23b156f1
|
#1249
update
|
2 years ago |
chenyifan01
|
e4890a9bfa
|
#1249
update
|
2 years ago |
ychao_1983
|
f00bbbf1ba
|
提交代码
|
2 years ago |
zhoupzh
|
4ffa5c94c8
|
解决冲突
|
2 years ago |
ychao_1983
|
531ca27fe2
|
提交代码
|
2 years ago |
ychao_1983
|
7055faf201
|
提交代码
|
2 years ago |
ychao_1983
|
61419e82c5
|
提交代码
|
2 years ago |
liuzx
|
313a176a65
|
merge
|
2 years ago |
ychao_1983
|
f7677b1cb5
|
提交代码
|
2 years ago |
ychao_1983
|
fee45b7b00
|
提交代码
|
2 years ago |
ychao_1983
|
8187c87e3d
|
提交代码
|
2 years ago |
ychao_1983
|
cc8b76eaca
|
提交代码
|
2 years ago |
ychao_1983
|
9ce1b017b7
|
提交代码
|
2 years ago |
ychao_1983
|
e24b67cfa9
|
提交代码
|
2 years ago |
ychao_1983
|
9df8fa9f24
|
提交代码
|
2 years ago |
ychao_1983
|
e54de5eb15
|
提交代码
|
2 years ago |
liuzx
|
a1887d2719
|
Merge remote-tracking branch 'origin/V20220926' into fix-2069
|
2 years ago |
chenyifan01
|
683b8bc066
|
Merge remote-tracking branch 'origin/V20220908' into point-v2
|
2 years ago |
chenyifan01
|
c16e277ecd
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
|
2 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
|
2 years ago |
liuzx
|
ba34ade887
|
Merge remote-tracking branch 'origin/V20220908' into fix-2069
|
2 years ago |
liuzx
|
3a8f3868ee
|
Merge remote-tracking branch 'origin/V20220830.patch' into fix-2069
|
2 years ago |
zouap
|
2f49112028
|
恢复重定向的方式输出日志。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
188556db15
|
恢复重定向的方式输出日志。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
6e5be3d93b
|
Merge remote-tracking branch 'origin/V20220908' into fix-2805
|
2 years ago |
chenyifan01
|
2d8f18129b
|
#2701
update
|
2 years ago |
chenyifan01
|
c5e0971655
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
# Conflicts:
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
|
2 years ago |
lewis
|
5969cce70e
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 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>
|
2 years ago |
ychao_1983
|
543ab98fe9
|
支持给指定组织定制节点数
|
2 years ago |
liuzx
|
fefb042477
|
Merge remote-tracking branch 'origin/V20220908' into fix-2069
|
2 years ago |
lewis
|
6ab10babca
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
zouap
|
1d64c9bcff
|
#2833 需求开发。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
2 years ago |
chenyifan01
|
6c85bacd74
|
#1249
update
|
2 years ago |
chenyifan01
|
05413fdb6c
|
#1249
update
|
2 years ago |
chenyifan01
|
fd972635f8
|
#1249
update
|
2 years ago |
chenyifan01
|
34c437c292
|
#1249
update point by resource management
|
2 years ago |
chenyifan01
|
8c3064b85f
|
#2805
update
|
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 |
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
|
2 years ago |
lewis
|
a4d8e34178
|
Merge branch 'V20220830' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
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 |