zouap
|
0d98890831
|
0918分支修改。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
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
|
8681fbd34b
|
#2701
update
|
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 |
chenyifan01
|
7d6abaa0f6
|
#2701
update
|
2 years ago |
chenyifan01
|
dc66fa4b3f
|
#2701
update
|
2 years ago |
chenyifan01
|
24c556b66f
|
#2701
update
|
2 years ago |
chenyifan01
|
3f9be66278
|
#2701
update
|
2 years ago |
zhoupzh
|
19a6ff20e4
|
Merge branch 'V20220830' into fix-2392
|
2 years ago |
chenyifan01
|
0e4d8844b8
|
#2701
update
|
2 years ago |
liuzx
|
71c107c09e
|
Merge branch 'V20220830' into fix-2643
|
2 years ago |
liuzx
|
d6b3b37abe
|
Delete cloudbrain task when deleting project
|
2 years ago |
chenyifan01
|
2898c40fcc
|
#2701
update
|
2 years ago |
ychao_1983
|
6a12647627
|
提交代码
|
2 years ago |
ychao_1983
|
630910604a
|
merge
|
2 years ago |
lewis
|
e92d948822
|
cd notebook
|
2 years ago |
liuzx
|
a6475ad5c6
|
Delete cloud brain task when deleting project
|
2 years ago |
ychao_1983
|
a9d3810e5f
|
提交代码
|
2 years ago |
zouap
|
ff249ec337
|
解决#2647
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
3bb312dd4c
|
#2701
update
|
2 years ago |
ychao_1983
|
6af10b01fa
|
提交代码
|
2 years ago |
chenyifan01
|
170cbacbf4
|
#2701
update
|
2 years ago |
chenyifan01
|
6366003ab1
|
#2701
find available specs
|
2 years ago |
zouap
|
a7a4e2c7c7
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
2 years ago |
chenyifan01
|
f39afe6e55
|
#2624
fix bug
|
2 years ago |
chenyifan01
|
5ee78082f4
|
#2624
fix bug
|
2 years ago |
ychao_1983
|
be4e51cce0
|
提交代码
|
2 years ago |
chenyifan01
|
2f1e7be34c
|
#2624
fix bug
|
2 years ago |
ychao_1983
|
2a8c5f901b
|
fix-2430
|
2 years ago |
ychao_1983
|
46e97062a2
|
提交代码
|
2 years ago |
chenyifan01
|
063ed6a054
|
#2624
update
|
2 years ago |
chenyifan01
|
0fcd85284a
|
#2624
update
|
2 years ago |
chenyifan01
|
11dbd635ef
|
#2624
update
|
2 years ago |
ychao_1983
|
a1c59d0a8f
|
提交代码
|
2 years ago |
zouap
|
53598bf21d
|
解决多数据集下显示错乱问题。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
6b08f66ec9
|
#2624
add SyncResourceSpecs
|
2 years ago |
chenyifan01
|
d6560049b6
|
#2624
update
|
2 years ago |
chenyifan01
|
d46be0e509
|
#2624
add admin operate log
|
2 years ago |
chenyifan01
|
92fedbbcba
|
#2624
add admin operate log
|
2 years ago |
chenyifan01
|
76aa963fe4
|
#2624
update
|
2 years ago |
chenyifan01
|
0e3d4bebd2
|
#2624
update
|
2 years ago |
chenyifan01
|
bfd98b85f3
|
#2624
update
|
2 years ago |
chenyifan01
|
9c8e0dacdd
|
#2624
update
|
2 years ago |
chenyifan01
|
7c11f9fe10
|
#2624
update
|
2 years ago |
lewis
|
162cb01f01
|
add created
|
2 years ago |