liuzx
|
f8705f4540
|
Merge remote-tracking branch 'origin/V20221116' into fix-3144
|
3 years ago |
chenyifan01
|
ef28d9ba94
|
#3196
fix bug
|
3 years ago |
liuzx
|
34f15799a1
|
fix-kanban
|
3 years ago |
liuzx
|
019bb5ad82
|
Merge remote-tracking branch 'origin/V20221116' into fix-3144
|
3 years ago |
chenyifan01
|
c2568fea41
|
#3168
fix bug
|
3 years ago |
liuzx
|
72d3ebb2d4
|
fix-kanban
|
3 years ago |
liuzx
|
5616a5a6ff
|
fix-kanban
|
3 years ago |
chenyifan01
|
667633835d
|
#3168
update
|
3 years ago |
liuzx
|
94ed16350e
|
fix-kanban
|
3 years ago |
ychao_1983
|
0d003410a4
|
Merge branch 'V20221116' into api
|
3 years ago |
liuzx
|
2c45939e17
|
fix-3153
|
3 years ago |
zouap
|
b9699f1db1
|
解决合并冲突。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
liuzx
|
3408c62c82
|
fix-3137
|
3 years ago |
liuzx
|
754f76c7a4
|
fix-3124
|
3 years ago |
chenyifan01
|
85b3a584ba
|
Merge branch 'res-api' into api
|
3 years ago |
zouap
|
6f641e8016
|
Merge remote-tracking branch 'origin/V20221019' into zouap_static
|
3 years ago |
chenyifan01
|
c571d0d627
|
bug fix
|
3 years ago |
zouap
|
93085e41bd
|
评测任务类型增加及修改。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
liuzx
|
26a1a08aca
|
update
|
3 years ago |
liuzx
|
2866436b36
|
fix-bug
|
3 years ago |
chenyifan01
|
30d1603176
|
#2943
add specification api
|
3 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
|
3 years ago |
chenyifan01
|
2d8f18129b
|
#2701
update
|
3 years ago |
chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
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
|
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
|
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
|
2898c40fcc
|
#2701
update
|
3 years ago |
chenyifan01
|
2f1e7be34c
|
#2624
fix bug
|
3 years ago |
chenyifan01
|
d6560049b6
|
#2624
update
|
3 years ago |
chenyifan01
|
450784dfe9
|
#2624
add response error
|
3 years ago |
chenyifan01
|
92fedbbcba
|
#2624
add admin operate log
|
3 years ago |
chenyifan01
|
9c8e0dacdd
|
#2624
update
|
3 years ago |
chenyifan01
|
c86f9e5909
|
#2624
add resource scene api
|
3 years ago |
liuzx
|
6ecaf187a2
|
fix-2633
|
3 years ago |
liuzx
|
cb4b798981
|
fix-2633
|
3 years ago |
liuzx
|
df07e73d30
|
add aicenter
|
3 years ago |
chenyifan01
|
ae2dfd235d
|
#2624
update
|
3 years ago |
chenyifan01
|
d1ddad1ae4
|
#2624
add queue codes api
|
3 years ago |
chenyifan01
|
b695183e5f
|
#2624
add resource specification
|
3 years ago |
chenyifan01
|
ba4f9b0e8f
|
#2624
add resource specification
|
3 years ago |
chenyifan01
|
bc163f5977
|
#2624
resource queue management
|
3 years ago |
chenshihai
|
515d2df74a
|
Resources Management
|
3 years ago |
chenyifan01
|
c90000a167
|
#2624
update resource page route
|
3 years ago |
chenyifan01
|
40c015de6b
|
#2624
add resource page route
|
3 years ago |
liuzx
|
dcb146b764
|
fix-2357
|
3 years ago |
liuzx
|
974dd5340f
|
fix-bug
|
3 years ago |
liuzx
|
9f55b0c082
|
fix-2357“
|
3 years ago |