chenyifan01
|
c16e277ecd
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
|
2 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
|
2 years ago |
liuzx
|
86b05f642f
|
fix-2069
|
2 years ago |
chenyifan01
|
4c414b9203
|
#2863
update
|
2 years ago |
chenyifan01
|
090e3f9279
|
#2863
update
|
2 years ago |
liuzx
|
ba34ade887
|
Merge remote-tracking branch 'origin/V20220908' into fix-2069
|
2 years ago |
liuzx
|
3a8f3868ee
|
Merge remote-tracking branch 'origin/V20220830.patch' into fix-2069
|
2 years ago |
chenyifan01
|
4ed9a05c20
|
#2863
#2862
update
|
2 years ago |
liuzx
|
c358b54fa6
|
fix-2859
|
2 years ago |
zouap
|
188556db15
|
恢复重定向的方式输出日志。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
liuzx
|
cb3d7947b9
|
fix-2859
|
2 years ago |
chenyifan01
|
5cb6ca395c
|
#2701
update
|
2 years ago |
chenyifan01
|
2d8f18129b
|
#2701
update
|
2 years ago |
chenyifan01
|
c5e0971655
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
# Conflicts:
# routers/repo/cloudbrain.go
# routers/repo/modelarts.go
|
2 years ago |
lewis
|
586e27d2fb
|
fix bug
|
2 years ago |
lewis
|
5969cce70e
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
lewis
|
56c33b24f6
|
Merge pull request '解决启智GPU训练错误任务的状态显示问题' (#2847) from V20220830.patch into V20220908
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2847
|
2 years ago |
lewis
|
cd2edcbd24
|
tee >
|
2 years ago |
lewis
|
a1c5dfa246
|
Merge pull request 'issue 2840' (#2842) from V20220830.patch into V20220908
Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2842
Reviewed-by: lewis <747342561@qq.com>
|
2 years ago |
ychao_1983
|
e142007fa8
|
提交代码
|
2 years ago |
ychao_1983
|
af0bada5d3
|
提交代码
|
2 years ago |
zhoupzh
|
670514bb4d
|
Merge branch 'V20220908' into fix-2833
|
2 years ago |
lewis
|
de61282452
|
show cd
|
2 years ago |
ychao_1983
|
543ab98fe9
|
支持给指定组织定制节点数
|
2 years ago |
lewis
|
6bd9b4198c
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
liuzx
|
7c6a21a6cf
|
add lock to stop same task
|
2 years ago |
chenyifan01
|
43dae8e0c7
|
Merge remote-tracking branch 'origin/V20220908' into res-manage-v2
# Conflicts:
# templates/repo/modelarts/trainjob/version_new.tmpl
|
2 years ago |
liuzx
|
fefb042477
|
Merge remote-tracking branch 'origin/V20220908' into fix-2069
|
2 years ago |
lewis
|
6ab10babca
|
Merge branch 'V20220908' of git.openi.org.cn:OpenI/aiforge into cd-notebook
|
2 years ago |
ychao_1983
|
8715816664
|
fix-2834
|
2 years ago |
zouap
|
1d64c9bcff
|
#2833 需求开发。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
7f8b23da8e
|
Merge remote-tracking branch 'origin/res-manage-v2' into point-v2
|
2 years ago |
zouap
|
8b8b439b55
|
继续解决Bug
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
efc5d33b5a
|
继续解决Bug
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
6c85bacd74
|
#1249
update
|
2 years ago |
zouap
|
5d53836348
|
继续解决Bug
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
94b2b0c7a7
|
提交代码,修改Bug
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
7e30906006
|
解决Bug
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
7e0b9281bc
|
#1249
add grampus point check
|
2 years ago |
chenyifan01
|
34c437c292
|
#1249
update point by resource management
|
2 years ago |
zouap
|
60eb5c89f0
|
数据集文件被删除之后,修改正常。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
0ba254854e
|
数据集文件被删除之后,修改正常。
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
7d9783847f
|
修正国际化相关内容
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
zouap
|
9aa0c172d3
|
修正国际化相关内容
Signed-off-by: zouap <zouap@pcl.ac.cn>
|
2 years ago |
chenyifan01
|
b69d18290e
|
Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
# Conflicts:
# templates/repo/modelarts/notebook/show.tmpl
|
2 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>
|
2 years ago |
ychao_1983
|
d7007c9bb8
|
fix-2788
|
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 |
chenyifan01
|
0f2d6fce05
|
#2701
update
|
2 years ago |