From a529e612948c834e4fcc50a8750f232e973afdac Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 21 Oct 2022 15:51:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/home.go | 5 + routers/routes/routes.go | 1 + templates/base/footer_content.tmpl | 3 +- templates/resource_desc.tmpl | 235 +++++++++++++++++++++++++++++++++++++ 4 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 templates/resource_desc.tmpl diff --git a/routers/home.go b/routers/home.go index ac607b5be..aab760611 100755 --- a/routers/home.go +++ b/routers/home.go @@ -41,6 +41,7 @@ const ( tplExploreExploreDataAnalysis base.TplName = "explore/data_analysis" tplHomeTerm base.TplName = "terms" tplHomePrivacy base.TplName = "privacy" + tplResoruceDesc base.TplName = "resource_desc" ) // Home render home page @@ -820,3 +821,7 @@ func HomeTerm(ctx *context.Context) { func HomePrivacy(ctx *context.Context) { ctx.HTML(200, tplHomePrivacy) } + +func HomeResoruceDesc(ctx *context.Context) { + ctx.HTML(200, tplResoruceDesc) +} \ No newline at end of file diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 9a523ea48..fd8bae7d7 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -338,6 +338,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/action/notification", routers.ActionNotification) m.Get("/recommend/home", routers.RecommendHomeInfo) m.Get("/dashboard/invitation", routers.GetMapInfo) + m.Get("/resource_desc", routers.HomeResoruceDesc) //m.Get("/recommend/org", routers.RecommendOrgFromPromote) //m.Get("/recommend/repo", routers.RecommendRepoFromPromote) m.Get("/recommend/userrank/:index", routers.GetUserRankFromPromote) diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index cdc2cf549..ce4ea5cc6 100755 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -36,7 +36,8 @@ {{else}} {{.i18n.Tr "custom.foot.advice_feedback"}} {{end}} - + {{.i18n.Tr "custom.Platform_Tutorial"}} + {{template "custom/extra_links_footer" .}} diff --git a/templates/resource_desc.tmpl b/templates/resource_desc.tmpl new file mode 100644 index 000000000..e809541ad --- /dev/null +++ b/templates/resource_desc.tmpl @@ -0,0 +1,235 @@ +{{template "base/head_home" .}} + +
+

平台资源说明

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
集群计算资源任务类型卡类型可用镜像网络类型数据集处理方式容器目录说明示例代码仓备注
启智集群GPU调试任务T4 +
    +
  • + 外部公开镜像，如：dockerhub镜像； +
    • +
  • 平台镜像；
    • +
+ 		能连外网平台可解压数据集 + 数据集存放路径/dataset，模型存放路径/model，代码存放路径/code +
训练任务V100 +
    +
  • 平台镜像；
    • +
+ 		不能连外网 + 训练脚本存储在/code中，数据集存储在/dataset中，预训练模型存放在环境变量ckpt_url中，训练输出请存储在/model中 + 以供后续下载。 + + https://git.openi.org.cn/OpenIO + SSG/MNIST_PytorchExample_GPU + + 启智集群V100不能连外网，只能使用平台的镜像，不可使用外部公开镜像，，否则任务会一直处于waiting + 状态 +
A100 +
    +
  • + 外部公开镜像，如：dockerhub镜像； +
    • +
  • 平台镜像；
    • +
+ 		能连外网
推理任务V100 +
    +
  • 平台镜像；
    • +
+ 		不能连外网 + 数据集存储在/dataset中，模型文件存储在/model中，推理输出请存储在/result中 + 以供后续下载。 + + https://git.openi.org.cn/OpenIO + SSG/MNIST_PytorchExample_GPU/src/branch/master/inference.py +
评测任务V100 +
    +
  • 平台镜像；
    • +
+ 		不能连外网 + 模型评测时，先使用数据集功能上传模型，然后从数据集列表选模型。 +
NPU调试任务Ascend 910 +
    +
  • 平台镜像；
    • +
+ 		能连外网
训练任务Ascend 910 + 数据集位置存储在环境变量data_url中，预训练模型存放在环境变量ckpt_url中，训练输出路径存储在环境变量train_url中。 + + https://git.openi.org.cn/OpenIOSSG/MNIST_Example +
推理任务Ascend 910 + 数据集位置存储在环境变量data_url中，推理输出路径存储在环境变量result_url中。 + + https://git.openi.org.cn/OpenIOSSG/MNIST_Example +
智算网络GPU训练任务V100 +
    +
  • + 外部公开镜像，如：dockerhub镜像； +
    • +
  • 平台镜像；
    • +
+ 		能连外网用户自行解压数据 集 + 训练脚本存储在/tmp/code中，数据集存储在/tmp/dataset中，预训练模型存放在环境变量ckpt_url中，训练输出请存储在/tmp/output中以供后续下载。 + + https://git.openi.org.cn/OpenIO + SSG/MNIST_PytorchExample_GPU/src/branch/master/train_for_c + A100 2net.py +
A100 +
    +
  • + 外部公开镜像，如：dockerhub镜像； +
    • +
  • 平台镜像；
    • +
+ 		能连外网
NPU训练任务Ascend 910 +
    +
  • 平台镜像；
    • +
+ 		能连外网 + 训练脚本存储在/cache/code中，预训练模型存放在环境变量ckpt_url中，训练输出请存储在/cache/output中以供后续下载。 + + https://git.openi.org.cn/OpenIO + SSG/MNIST_Example/src/branch/master/train_for_c2net.py +
+
+ +{{template "base/footer" .}} From 8808452bb2f8b6879acc9320954d598b254f7a7c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 24 Oct 2022 12:28:16 +0800 Subject: [PATCH 2/3] fix issue --- templates/resource_desc.tmpl | 267 ++++++++++--------------------------------- 1 file changed, 62 insertions(+), 205 deletions(-) diff --git a/templates/resource_desc.tmpl b/templates/resource_desc.tmpl index e809541ad..30ae3ff14 100644 --- a/templates/resource_desc.tmpl +++ b/templates/resource_desc.tmpl @@ -24,212 +24,69 @@ 备注 - - - 启智集群 - GPU - 调试任务 - T4 - - - - 能连外网 - 平台可解压数据集 - - 数据集存放路径/dataset，模型存放路径/model，代码存放路径/code - - - - - - 训练任务 - V100 - - - - 不能连外网 - - 训练脚本存储在/code中，数据集存储在/dataset中，预训练模型存放在环境变量ckpt_url中，训练输出请存储在/model中 - 以供后续下载。 - - - https://git.openi.org.cn/OpenIO - SSG/MNIST_PytorchExample_GPU - - - 启智集群V100不能连外网，只能使用平台的镜像，不可使用外部公开镜像，，否则任务会一直处于waiting - 状态 - - - - A100 - - - - 能连外网 - - - - 推理任务 - V100 - - - - 不能连外网 - - 数据集存储在/dataset中，模型文件存储在/model中，推理输出请存储在/result中 - 以供后续下载。 - - - https://git.openi.org.cn/OpenIO - SSG/MNIST_PytorchExample_GPU/src/branch/master/inference.py - - - - - 评测任务 - V100 - - - - 不能连外网 - - - - 模型评测时，先使用数据集功能上传模型，然后从数据集列表选模型。 - - - - NPU - 调试任务 - Ascend 910 - - - - 能连外网 - - - - - - 训练任务 - Ascend 910 - - 数据集位置存储在环境变量data_url中，预训练模型存放在环境变量ckpt_url中，训练输出路径存储在环境变量train_url中。 - - - https://git.openi.org.cn/OpenIOSSG/MNIST_Example - - - - - 推理任务 - Ascend 910 - - 数据集位置存储在环境变量data_url中，推理输出路径存储在环境变量result_url中。 - - - https://git.openi.org.cn/OpenIOSSG/MNIST_Example - - - - - 智算网络 - GPU - 训练任务 - V100 - - - - 能连外网 - 用户自行解压数据 集 - - 训练脚本存储在/tmp/code中，数据集存储在/tmp/dataset中，预训练模型存放在环境变量ckpt_url中，训练输出请存储在/tmp/output中以供后续下载。 - - - https://git.openi.org.cn/OpenIO - SSG/MNIST_PytorchExample_GPU/src/branch/master/train_for_c - A100 2net.py - - - - - A100 - - - - 能连外网 - - - - NPU - 训练任务 - Ascend 910 - - - - 能连外网 - - 训练脚本存储在/cache/code中，预训练模型存放在环境变量ckpt_url中，训练输出请存储在/cache/output中以供后续下载。 - - - https://git.openi.org.cn/OpenIO - SSG/MNIST_Example/src/branch/master/train_for_c2net.py - - - - + {{template "base/footer" .}} + From 9f7b111750b7652ddeeafe086852f806f3e21676 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 25 Oct 2022 15:19:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=85=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 2 +- options/locale/locale_zh-CN.ini | 1 + templates/base/footer_content.tmpl | 2 +- templates/base/footer_content_fluid.tmpl | 1 + templates/repo/cloudbrain/benchmark/new.tmpl | 6 ++++++ templates/repo/cloudbrain/inference/new.tmpl | 2 ++ templates/repo/cloudbrain/new.tmpl | 2 ++ templates/repo/cloudbrain/trainjob/new.tmpl | 2 ++ templates/repo/grampus/trainjob/gpu/new.tmpl | 2 ++ templates/repo/grampus/trainjob/npu/new.tmpl | 2 ++ templates/repo/modelarts/inferencejob/new.tmpl | 2 ++ templates/repo/modelarts/notebook/new.tmpl | 2 ++ templates/repo/modelarts/trainjob/new.tmpl | 2 ++ templates/repo/modelarts/trainjob/version_new.tmpl | 2 ++ templates/repo/modelsafety/new.tmpl | 2 ++ 15 files changed, 30 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 773a338c1..6aca6bd20 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3177,7 +3177,7 @@ foot.help = help foot.copyright= Copyright: New Generation Artificial Intelligence Open Source Open Platform (OpenI) Platform_Tutorial = Tutorial foot.advice_feedback = Feedback - +resource_description = Resource Note [cloudbrain] all_resource_cluster=All Cluster all_ai_center=All Computing NET diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 8ba4d252d..9a99fa5b5 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3194,6 +3194,7 @@ foot.help=帮助 foot.copyright= 版权所有：新一代人工智能开源开放平台（OpenI） Platform_Tutorial=新手指引 foot.advice_feedback = 意见反馈 +resource_description = 资源说明 [cloudbrain] all_resource_cluster=全部集群 diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index ce4ea5cc6..8786af653 100755 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -36,7 +36,7 @@ {{else}} {{.i18n.Tr "custom.foot.advice_feedback"}} {{end}} - {{.i18n.Tr "custom.Platform_Tutorial"}} + {{.i18n.Tr "custom.resource_description"}} {{template "custom/extra_links_footer" .}} diff --git a/templates/base/footer_content_fluid.tmpl b/templates/base/footer_content_fluid.tmpl index 24b18e94d..723c78045 100755 --- a/templates/base/footer_content_fluid.tmpl +++ b/templates/base/footer_content_fluid.tmpl @@ -33,6 +33,7 @@ {{else}} {{.i18n.Tr "custom.foot.advice_feedback"}} {{end}} + {{.i18n.Tr "custom.resource_description"}} {{template "custom/extra_links_footer" .}} diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 13665c036..23ac60427 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -136,6 +136,8 @@ {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} name="spec_id"> + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} @@ -248,6 +250,8 @@ {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} name="spec_id"> + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} @@ -334,6 +338,8 @@ placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' ovalue="{{.spec_id}}" name="spec_id"> + + {{.i18n.Tr "custom.resource_description"}}
diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index 630df7a2e..fc57e3a6b 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -256,6 +256,8 @@ + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index fb7ccbed1..0c545c7c1 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -149,6 +149,8 @@ {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} name="spec_id"> + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index 607af5f07..9c778f3f8 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -216,6 +216,8 @@ {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} name="spec_id"> + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/grampus/trainjob/gpu/new.tmpl b/templates/repo/grampus/trainjob/gpu/new.tmpl index e97ccfe59..97a7cedcf 100755 --- a/templates/repo/grampus/trainjob/gpu/new.tmpl +++ b/templates/repo/grampus/trainjob/gpu/new.tmpl @@ -189,6 +189,8 @@
+ + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/grampus/trainjob/npu/new.tmpl b/templates/repo/grampus/trainjob/npu/new.tmpl index 51a561d3d..3528cc661 100755 --- a/templates/repo/grampus/trainjob/npu/new.tmpl +++ b/templates/repo/grampus/trainjob/npu/new.tmpl @@ -199,6 +199,8 @@
+ + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl index d2f6a8194..855f5b1b6 100644 --- a/templates/repo/modelarts/inferencejob/new.tmpl +++ b/templates/repo/modelarts/inferencejob/new.tmpl @@ -276,6 +276,8 @@
+ + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index f9c4670a5..da29a4e46 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -82,6 +82,8 @@ + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 0e1e8eedb..1250b8805 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -247,6 +247,8 @@
+ + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl index 89bf6fc08..e1107ce84 100644 --- a/templates/repo/modelarts/trainjob/version_new.tmpl +++ b/templates/repo/modelarts/trainjob/version_new.tmpl @@ -236,6 +236,8 @@
+ + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index 07bcd311d..1b97207b7 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -299,6 +299,8 @@ {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}} name="spec_id"> + + {{.i18n.Tr "custom.resource_description"}} {{if .CloudBrainPaySwitch}}
{{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}}