chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
3 years ago |
chenyifan01
|
6c85bacd74
|
#1249
update
|
3 years ago |
chenyifan01
|
f8350bda10
|
#1249
update
|
3 years ago |
chenyifan01
|
fd972635f8
|
#1249
update
|
3 years ago |
chenyifan01
|
7e0b9281bc
|
#1249
add grampus point check
|
3 years ago |
chenyifan01
|
34c437c292
|
#1249
update point by resource management
|
3 years ago |
chenyifan01
|
7bd08b5983
|
Merge remote-tracking branch 'origin/res-manage' into res-manage-v2
|
3 years ago |
chenyifan01
|
b0d19cedc3
|
#2701
update
|
3 years ago |
chenyifan01
|
8afc0560ff
|
#2701
show spec is available or not
|
3 years ago |
chenyifan01
|
b69d18290e
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
# Conflicts:
# templates/repo/modelarts/notebook/show.tmpl
|
3 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>
|
3 years ago |
ychao_1983
|
d7007c9bb8
|
fix-2788
|
3 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
|
3 years ago |
chenyifan01
|
a692651642
|
Merge remote-tracking branch 'origin/V20220830' into res-manage
# Conflicts:
# models/models.go
# modules/cron/tasks_basic.go
|
3 years ago |
chenyifan01
|
0f2d6fce05
|
#2701
update
|
3 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
|
3 years ago |
chenyifan01
|
7d6abaa0f6
|
#2701
update
|
3 years ago |
zouap
|
af6c0020b1
|
NPU推理支持多数据集修改。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
1b4b30c80c
|
日志重定向研究
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
0bad0b1b56
|
#2701
update grampus spec
|
3 years ago |
chenyifan01
|
03b3efe777
|
#2701
update grampus spec
|
3 years ago |
chenyifan01
|
19603f0fbf
|
#2701
fix bug of restart
|
3 years ago |
chenyifan01
|
e378b23aac
|
#2701
update
|
3 years ago |
lewis
|
31ac3b5687
|
Merge pull request 'fix-2744' (#2753) from fix-2744 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2753
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
liuzx
|
62aeded28a
|
fix-2744
|
3 years ago |
zhoupzh
|
351ed71e05
|
Merge branch 'V20220830' into fix-2392
|
3 years ago |
chenyifan01
|
e5683a86b2
|
#2701
update
|
3 years ago |
chenyifan01
|
7e73b0c261
|
#2701
update
|
3 years ago |
chenyifan01
|
3f9be66278
|
#2701
update
|
3 years ago |
zhoupzh
|
19a6ff20e4
|
Merge branch 'V20220830' into fix-2392
|
3 years ago |
liuzx
|
3e965bd99b
|
fix-2643
|
3 years ago |
liuzx
|
e62810552e
|
Merge branch 'fix-2643' of https://git.openi.org.cn/OpenI/aiforge into fix-2643
|
3 years ago |
liuzx
|
739f68a389
|
Delete cloudbrain task when deleting project
|
3 years ago |
chenyifan01
|
0e4d8844b8
|
#2701
update
|
3 years ago |
liuzx
|
71c107c09e
|
Merge branch 'V20220830' into fix-2643
|
3 years ago |
liuzx
|
d6b3b37abe
|
Delete cloudbrain task when deleting project
|
3 years ago |
chenyifan01
|
24f7aa6d4a
|
#2701
update
|
3 years ago |
zouap
|
22cf0fa2c1
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zouap
|
fb8113a1ea
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
5f0a374688
|
提交代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenyifan01
|
2898c40fcc
|
#2701
update
|
3 years ago |
ychao_1983
|
630910604a
|
merge
|
3 years ago |
ychao_1983
|
959a1d5298
|
提交代码
|
3 years ago |
lewis
|
8d8b5b8901
|
Merge pull request '解决#2647及相关国际化修改。' (#2732) from zouap into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2732
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
zouap
|
0ef0a4313e
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zhoupzh
|
f5b8012364
|
Merge branch 'V20220830' into fix-2628
|
3 years ago |
ychao_1983
|
5fad81eca3
|
提交代码
|
3 years ago |
lewis
|
ea1d5b19d9
|
#2734
|
3 years ago |
ychao_1983
|
706a3499bd
|
权限控制
|
3 years ago |
zouap
|
b97d7e48a1
|
解决#2647
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |