zouap
|
a84152653a
|
代码提交。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
a0842964cc
|
Merge remote-tracking branch 'origin/V20220908' into zouap
|
2 years ago |
zouap
|
2eeb3d53b6
|
提交代码,老拉新需求
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
6c85bacd74
|
#1249
update
|
2 years ago |
chenyifan01
|
f8350bda10
|
#1249
update
|
2 years ago |
zouap
|
a51f736543
|
老拉新需求
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
fd972635f8
|
#1249
update
|
2 years ago |
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 |
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 |
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>
|
2 years ago |
liuzx
|
62aeded28a
|
fix-2744
|
2 years ago |
ychao_1983
|
630910604a
|
merge
|
2 years ago |
ychao_1983
|
5fad81eca3
|
提交代码
|
2 years ago |
ychao_1983
|
706a3499bd
|
权限控制
|
2 years ago |
zouap
|
1a37b35523
|
调整GPU训练任务的日志显示逻辑。#2706
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
5fbc6b1862
|
调整GPU训练任务的日志显示逻辑。#2706
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
ychao_1983
|
36cb70f519
|
提交代码
|
2 years ago |
ychao_1983
|
a1c59d0a8f
|
提交代码
|
2 years ago |
chenyifan01
|
d6560049b6
|
#2624
update
|
2 years ago |
chenyifan01
|
9c8e0dacdd
|
#2624
update
|
2 years ago |
chenyifan01
|
c86f9e5909
|
#2624
add resource scene api
|
2 years ago |
chenyifan01
|
d1ddad1ae4
|
#2624
add queue codes api
|
2 years ago |
chenyifan01
|
ba4f9b0e8f
|
#2624
add resource specification
|
2 years ago |
chenyifan01
|
bc163f5977
|
#2624
resource queue management
|
2 years ago |
chenyifan01
|
40c015de6b
|
#2624
add resource page route
|
2 years ago |
lewis
|
2567a66f88
|
merge
|
2 years ago |
ychao_1983
|
da9137d638
|
fix-1358
|
2 years ago |
lewis
|
f4b59d0f66
|
mod research
|
2 years ago |
ychao_1983
|
9d42e312d7
|
fix-2370
|
2 years ago |
zouap
|
c15be5eb62
|
合并最新的代码,解决冲突。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
ychao_1983
|
4957ecadcb
|
merger
|
2 years ago |
chenyifan01
|
64dcabedda
|
Merge remote-tracking branch 'origin/V20220718' into point-v2
# Conflicts:
# routers/routes/routes.go
# webpack.config.js
# webpack_pro.config.js
|
2 years ago |
chenyifan01
|
df7224103d
|
#2225
add point limit config api
|
2 years ago |
zouap
|
3e832bfc4d
|
合并最新分支代码。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
8c6d55be6b
|
Merge remote-tracking branch 'origin/V20220718' into point-v2
# Conflicts:
# models/cloudbrain.go
# modules/modelarts/modelarts.go
|
3 years ago |
chenyifan01
|
1c94ca65e8
|
#2225
add admin reward operation record query api
|
3 years ago |
ychao_1983
|
e43085ca2e
|
提交代码
|
3 years ago |
chenyifan01
|
540f79710d
|
#2225
add admin point operation
|
3 years ago |
ychao_1983
|
b1e95c666f
|
Merge branch 'V20220718' into phone
|
3 years ago |
chenyifan01
|
45b1c2a24f
|
#2225
fix bug
|
3 years ago |
chenshihai
|
26c6d03ef2
|
隐私协议
|
3 years ago |
ychao_1983
|
2c6f265cdd
|
提交代码
|
3 years ago |
chenyifan01
|
66fb71107f
|
#2225
add point rule route
|
3 years ago |
chenyifan01
|
a4932912d1
|
Merge remote-tracking branch 'origin/V20220630' into point-v2
# Conflicts:
# models/action.go
# modules/setting/setting.go
# routers/repo/cloudbrain.go
|
3 years ago |
zouap
|
dbb76aa6d6
|
模型管理冲突解决。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
zouap
|
ca7b84ad49
|
Merge remote-tracking branch 'origin/V20220630' into zouap_static
|
3 years ago |
chenyifan01
|
77e9692c2e
|
#2225
update
|
3 years ago |
lewis
|
3fcbe2d6d7
|
merge
|
3 years ago |