zhoupzh
|
4ffa5c94c8
|
解决冲突
|
2 years ago |
zouap
|
f160f45f4d
|
Merge remote-tracking branch 'origin/V20220926' into zouap
|
2 years ago |
ychao_1983
|
9ce1b017b7
|
提交代码
|
2 years ago |
chenyifan01
|
683b8bc066
|
Merge remote-tracking branch 'origin/V20220908' into point-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 |
zouap
|
6fc31f806c
|
首页国际化修改。
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 |
lewis
|
5969cce70e
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
ychao_1983
|
543ab98fe9
|
支持给指定组织定制节点数
|
2 years ago |
chenyifan01
|
8c3064b85f
|
#2805
update
|
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
|
e92d948822
|
cd notebook
|
2 years ago |
lewis
|
cdae759a09
|
init
|
2 years ago |
zouap
|
0018f529a9
|
Merge branch 'V20220815' into fix502
|
2 years ago |
chenyifan01
|
879d29594c
|
#2631
add cloudbrain task stop template msg
|
2 years ago |
lewis
|
1e516cc458
|
debug
|
2 years ago |
lewis
|
f4b59d0f66
|
mod research
|
2 years ago |
lewis
|
01891a1bde
|
Merge pull request '云脑二专属资源池' (#2582) from V20220718.patch into V20220801
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2582
Reviewed-by: lewis <747342561@qq.com>
|
2 years ago |
ychao_1983
|
89246d387a
|
云脑二专属资源池
|
2 years ago |
chenyifan01
|
17b5416cbb
|
#2479
update
|
2 years ago |
chenyifan01
|
132030bc04
|
#2479
update
|
2 years ago |
chenyifan01
|
aa631ec99a
|
#2479
update wechat template msg
|
2 years ago |
chenyifan01
|
cf47b1241a
|
#2479
add wechat template msg
|
2 years ago |
zouap
|
c15be5eb62
|
合并最新的代码,解决冲突。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zhoupzh
|
c831602a5b
|
fix issue
|
2 years ago |
zouap
|
66ed6049c9
|
合并最新代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
ychao_1983
|
bd2be34b10
|
Merge pull request '在首页正确展示任务分中心信息' (#2469) from show-ai-center-info into V20220718
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2469
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
|
2 years ago |
ychao_1983
|
8024f45f10
|
merge
|
2 years ago |
chenyifan01
|
518fcc5406
|
Merge remote-tracking branch 'origin/V20220718' into point-v2
# Conflicts:
# routers/repo/cloudbrain.go
|
2 years ago |
ychao_1983
|
ae6ddd0aa8
|
提交代码
|
2 years ago |
zouap
|
d218e7450f
|
合并0718分支。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
avadesian
|
7a81672a81
|
Merge branch 'V20220718' of https://git.openi.org.cn/OpenI/aiforge into fix-2452
|
2 years ago |
avadesian
|
79c04cc0da
|
change cloudbrain debug command
|
2 years ago |
chenyifan01
|
ead1bbfd15
|
#2225
add log
|
2 years ago |
ychao_1983
|
e7613c4084
|
提交代码
|
2 years ago |
chenyifan01
|
64dcabedda
|
Merge remote-tracking branch 'origin/V20220718' into point-v2
# Conflicts:
# routers/routes/routes.go
# webpack.config.js
# webpack_pro.config.js
|
2 years ago |
lewis
|
56cba84701
|
Merge branch 'V20220718' of git.openi.org.cn:OpenI/aiforge into show-ai-center-info
|
2 years ago |
zouap
|
3e832bfc4d
|
合并最新分支代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
8c6d55be6b
|
Merge remote-tracking branch 'origin/V20220718' into point-v2
# Conflicts:
# models/cloudbrain.go
# modules/modelarts/modelarts.go
|
2 years ago |
lewis
|
00044fbc21
|
add interface
|
2 years ago |
zouap
|
3c76ea3753
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
ychao_1983
|
b1e95c666f
|
Merge branch 'V20220718' into phone
|
2 years ago |
chenyifan01
|
a4932912d1
|
Merge remote-tracking branch 'origin/V20220630' into point-v2
# Conflicts:
# models/action.go
# modules/setting/setting.go
# routers/repo/cloudbrain.go
|
2 years ago |
zouap
|
dbb76aa6d6
|
模型管理冲突解决。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
ca7b84ad49
|
Merge remote-tracking branch 'origin/V20220630' into zouap_static
|
3 years ago |
lewis
|
65d23beb88
|
Merge branch 'V20220630' of git.openi.org.cn:OpenI/aiforge into multi-dataset
|
3 years ago |
ychao_1983
|
762d5144c1
|
merge
|
3 years ago |
lewis
|
3fcbe2d6d7
|
merge
|
3 years ago |
lewis
|
1a2dd0a1e8
|
Merge branch 'V20220630' of git.openi.org.cn:OpenI/aiforge into grampus
|
3 years ago |
zouap
|
b5ede41952
|
Merge remote-tracking branch 'origin/V20220630' into zouap_static
|
3 years ago |