zhoupzh
|
3f15d92374
|
Merge branch 'V20220926' into pretrainmodel
|
2 years ago |
chenshihai
|
59621de5ce
|
Merge branch 'V20220926' into point-v2
|
2 years ago |
zhoupzh
|
5ea282ed97
|
解决冲突
|
2 years ago |
zhoupzh
|
4ffa5c94c8
|
解决冲突
|
2 years ago |
chenyifan01
|
2611d9e31f
|
#2872
add rule config api
|
2 years ago |
liuzx
|
46ed205606
|
Merge branch 'V20220926' into fix-2069
|
2 years ago |
chenyifan01
|
e0ddc24fe2
|
#2872
fix bug
|
2 years ago |
liuzx
|
313a176a65
|
merge
|
2 years ago |
chenyifan01
|
926df6a63d
|
#1249
Fixed the display problem of cloudbrain specifications
|
2 years ago |
chenyifan01
|
cc9d7adc72
|
#1249
fix bug
|
2 years ago |
ychao_1983
|
e24b67cfa9
|
提交代码
|
2 years ago |
ychao_1983
|
e54de5eb15
|
提交代码
|
2 years ago |
liuzx
|
a1887d2719
|
Merge remote-tracking branch 'origin/V20220926' into fix-2069
|
2 years ago |
chenyifan01
|
bd759a0e40
|
Merge remote-tracking branch 'origin/V20220926' into point-v2
|
2 years ago |
ychao_1983
|
53bb13abb5
|
修复数据集选择的bug
|
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
|
86b05f642f
|
fix-2069
|
2 years ago |
chenyifan01
|
4ed9a05c20
|
#2863
#2862
update
|
2 years ago |
chenyifan01
|
676821ac0f
|
#2701
update
|
2 years ago |
chenyifan01
|
4da1922708
|
#2701
update
|
2 years ago |
chenyifan01
|
5cb6ca395c
|
#2701
update
|
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
|
586e27d2fb
|
fix bug
|
2 years ago |
lewis
|
d491788f0b
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
chenyifan01
|
43dae8e0c7
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
# Conflicts:
# templates/repo/modelarts/trainjob/version_new.tmpl
|
2 years ago |
lewis
|
6ab10babca
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
ychao_1983
|
8715816664
|
fix-2834
|
2 years ago |
chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
2 years ago |
chenyifan01
|
14b40da171
|
#2701
update spec order
|
2 years ago |
chenyifan01
|
6c85bacd74
|
#1249
update
|
2 years ago |
zouap
|
2002f99f42
|
Merge branch 'V20220830' into fix-2392
|
2 years ago |
ychao_1983
|
2c95d6421e
|
修复关联数据集权限问题
|
2 years ago |
chenyifan01
|
34c437c292
|
#1249
update point by resource management
|
2 years ago |
liuzx
|
f5ba1417c0
|
Merge branch 'V20220830' into fix-2643
|
2 years ago |
liuzx
|
1d41d33a81
|
add ModelArtsDeleting status
|
2 years ago |
liuzx
|
dc219754e2
|
merge
|
2 years ago |
chenyifan01
|
7bd08b5983
|
Merge remote-tracking branch 'origin/res-manage' into res-manage-v2
|
2 years ago |
liuzx
|
fb275fafac
|
add killing
|
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 |
zouap
|
7d9783847f
|
修正国际化相关内容
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
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
|
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 |
ychao_1983
|
d7007c9bb8
|
fix-2788
|
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 |
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 |
liuzx
|
29b966c0a4
|
Merge branch 'V20220830' into fix-2643
|
2 years ago |