chenyifan01
|
6c85bacd74
|
#1249
update
|
3 years ago |
chenshihai
|
bd3ec081f1
|
point show
|
3 years ago |
chenshihai
|
1c541adba0
|
point use
|
3 years ago |
chenyifan01
|
f8350bda10
|
#1249
update
|
3 years ago |
chenyifan01
|
05413fdb6c
|
#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
|
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
|
57ec2f0442
|
Merge branch 'res-manage' into res-manage-v2
# Conflicts:
# models/models.go
|
3 years ago |
chenyifan01
|
3896459ed0
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
|
3 years ago |
chenyifan01
|
e636f73da7
|
Merge remote-tracking branch 'origin/res-manage-v2' into res-manage-v2
|
3 years ago |
chenyifan01
|
525e3e941f
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
|
3 years ago |
chenshihai
|
68eb424847
|
Merge pull request 'fix-2764' (#2782) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2782
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
3 years ago |
chenshihai
|
817ceb8d6c
|
update dir tips
|
3 years ago |
zhoupzh
|
425b786bf3
|
fix issue
|
3 years ago |
zhoupzh
|
53d66135fc
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
3 years ago |
zhoupzh
|
4225ac6544
|
fix issue
|
3 years ago |
zhoupzh
|
6b0637b3d9
|
Merge branch 'V20220830' into fix-2764
|
3 years ago |
zhoupzh
|
bf947055e2
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
3 years ago |
zhoupzh
|
960bbede5c
|
fix issue
|
3 years ago |
zhoupzh
|
9fb4f9a63c
|
fix issue
|
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
|
8681fbd34b
|
#2701
update
|
3 years ago |
chenshihai
|
35d77af012
|
Resources Management
|
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 |
chenshihai
|
78bb7a6d5b
|
Merge pull request '关联数据集阻止事件冒泡和样式修改' (#2778) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2778
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
94ac3a950a
|
Merge branch 'V20220830' into fix-2764
|
3 years ago |
zhoupzh
|
65eb1f4c9f
|
关联数据集的一些点击事件的优化
|
3 years ago |
chenyifan01
|
7d6abaa0f6
|
#2701
update
|
3 years ago |
zhoupzh
|
46b8fe7bba
|
关联数据集的一些点击事件的优化
|
3 years ago |
lewis
|
78562abdec
|
Merge pull request 'NPU推理支持多数据集Bug修改及 GPU训练的日志重定向命令修改成tee命令。' (#2776) from zouap into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2776
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
zouap
|
81a9400246
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zouap
|
af6c0020b1
|
NPU推理支持多数据集修改。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
59e08b0273
|
update resources management
|
3 years ago |
zouap
|
1b4b30c80c
|
日志重定向研究
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
450b821b37
|
Merge pull request '中英文修改' (#2774) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2774
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
3 years ago |
zhoupzh
|
b2ebf79f10
|
Merge branch 'fix-2764' of git.openi.org.cn:OpenI/aiforge into fix-2764
|
3 years ago |
zhoupzh
|
32c2e01c69
|
中英文修改
|
3 years ago |
zhoupzh
|
e9a64bc67b
|
Merge branch 'V20220830' into fix-2764
|
3 years ago |
zhoupzh
|
e222c4f5dd
|
中英文修改
|
3 years ago |
lewis
|
c1b969ac54
|
Merge pull request '新建gpu调试任务页面排队任务数有时候为空' (#2768) from fix-2392 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2768
Reviewed-by: lewis <747342561@qq.com>
|
3 years ago |
chenyifan01
|
f5110e69a5
|
Merge remote-tracking branch 'origin/res-manage-v2' into res-manage-v2
|
3 years ago |
chenyifan01
|
dc66fa4b3f
|
#2701
update
|
3 years ago |
ychao_1983
|
372be23544
|
新建gpu调试任务页面排队任务数有时候为空
|
3 years ago |
zhoupzh
|
1712dcccc4
|
Merge pull request '#2760,#2759 及模型相关国际化信息' (#2767) from zouap into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2767
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>
|
3 years ago |
zouap
|
c33167b845
|
Merge remote-tracking branch 'origin/V20220830' into zouap
|
3 years ago |
zouap
|
7d1d1a39df
|
国际化信息提交。#2760
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
3 years ago |
chenshihai
|
9b9651042c
|
Merge pull request 'fix issue' (#2766) from fix-2764 into V20220830
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2766
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
|
3 years ago |