chenyifan01
|
39f632b7df
|
#1249
update
|
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 |
liuzx
|
a1887d2719
|
Merge remote-tracking branch 'origin/V20220926' into fix-2069
|
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
|
676821ac0f
|
#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 |
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 |
chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
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 |
liuzx
|
fb275fafac
|
add killing
|
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 |
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 |
liuzx
|
69b31dc48e
|
add stopping status
|
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 |
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
|
2 years ago |
zhoupzh
|
19a6ff20e4
|
Merge branch 'V20220830' into fix-2392
|
2 years ago |
chenyifan01
|
0e4d8844b8
|
#2701
update
|
2 years ago |
liuzx
|
d6b3b37abe
|
Delete cloudbrain task when deleting project
|
2 years ago |
chenyifan01
|
2898c40fcc
|
#2701
update
|
2 years ago |
ychao_1983
|
630910604a
|
merge
|
2 years ago |
lewis
|
e92d948822
|
cd notebook
|
2 years ago |
chenyifan01
|
3bb312dd4c
|
#2701
update
|
2 years ago |
chenyifan01
|
6366003ab1
|
#2701
find available specs
|
2 years ago |
ychao_1983
|
2a8c5f901b
|
fix-2430
|
2 years ago |
zouap
|
53598bf21d
|
解决多数据集下显示错乱问题。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
9c8e0dacdd
|
#2624
update
|
2 years ago |
lewis
|
a4b3d325d8
|
Merge branch 'V20220815' of git.openi.org.cn:OpenI/aiforge into fix502
|
2 years ago |
liuzx
|
cb4b798981
|
fix-2633
|
2 years ago |
liuzx
|
df07e73d30
|
add aicenter
|
2 years ago |
chenyifan01
|
bc163f5977
|
#2624
resource queue management
|
2 years ago |
liuzx
|
d645b39956
|
删除冗余代码,fix-2650
|
2 years ago |
lewis
|
2567a66f88
|
merge
|
2 years ago |
lewis
|
4895dc4973
|
sync
|
2 years ago |
liuzx
|
c67d453569
|
fix-bug
|
2 years ago |
liuzx
|
3d3c877678
|
fix-2595
|
2 years ago |
lewis
|
f4b59d0f66
|
mod research
|
2 years ago |
liuzx
|
4835745f20
|
fix
|
2 years ago |