Merge remote-tracking branch 'origin/V20220815' into fix-2631

options/locale/locale_en-US.ini

@@ -253,10 +253,11 @@ page_dev_env_desc2_desc=Associate the model with the code version, you can adjus
 page_dev_env_desc3_title=Once Configuration, Multiple Reuse
 page_dev_env_desc3_desc=Provide execution environment sharing, Once Configuration, Multiple Reuse. Lower the threshold of model development, and avoid spending repetitive time configuring complex environments.
 page_dev_yunlao=OpenI AI Collaboration Platform
-page_dev_yunlao_desc1=OpenI AI collaboration platform has been connected with Pengcheng CloudBrain and China computing network (c2net) in phase I, and can use the rich computing resources of Pengcheng CloudBrain and China computing network to complete AI development tasks.
-page_dev_yunlao_desc2=Pengcheng CloudBrain's existing AI computing power is 100p FLOPS@FP16 (billions of half precision floating-point calculations per second), the main hardware infrastructure is composed of GPU servers equipped with NVIDIA Tesla V100 and A100, and Atlas 900 AI clusters equipped with Kunpeng and shengteng processors; China computing network (c2net) phase I can realize the high-speed network interconnection between different AI computing centers, realize the reasonable scheduling of computing power and the flexible allocation of resources. At present, it has been connected to 11 intelligent computing centers, with a total scale of 1924p.
-page_dev_yunlao_desc3=OpenI AI collaboration platform has been connected to Pengcheng Cloud Computing Institute, Chengdu Intelligent Computing Center, Zhongyuan Intelligent Computing Center, Hefei brain and other nodes. Developers can freely choose the corresponding computing resources according to their use needs, and can test the adaptability, performance, stability, etc. of the model in different hardware environments.
-page_dev_yunlao_desc4=If your model requires more computing resources, you can also apply for it separately.
+page_dev_yunlao_desc1=OpenI AI collaboration platform has cooperated with Pengcheng cloud brain and China computing power network (c ² Net) can be used to complete AI development tasks by using the rich computing resources of Pengcheng cloud brain and China computing network.
+page_dev_yunlao_desc2=Pengcheng CloudBrain's existing AI computing power is 100p FLOPS@FP16 (billions of half precision floating-point calculations per second), the main hardware infrastructure consists of GPU servers equipped with NVIDIA Tesla V100 and A100, and Atlas 900 AI clusters equipped with Kunpeng and shengteng processors.
+page_dev_yunlao_desc3=China computing power network (c ² Net) phase I can realize high-speed network interconnection between different artificial intelligence computing centers, and realize reasonable scheduling of computing power and flexible allocation of resources. At present, 11 intelligent computing centers have been connected, and the total scale of computing power is 1924p OPS@FP16 。 Qizhi AI collaboration platform has been connected to Pengcheng Cloud Computing Institute, Chengdu Intelligent Computing Center, Zhongyuan Intelligent Computing Center, Hefei brain and other nodes.
+page_dev_yunlao_desc4=Developers can freely select the corresponding computing resources according to the use needs, and can test the adaptability, performance, stability, etc. of the model in different hardware environments.
+page_dev_yunlao_desc5=If your model requires more computing resources, you can also apply for it separately.
 page_dev_yunlao_apply=Apply Separately
 
 search=Search

options/locale/locale_zh-CN.ini

@@ -255,10 +255,11 @@ page_dev_env_desc2_desc=将模型与代码版本建立关联，可以基于代
 page_dev_env_desc3_title=一次配置，多次使用
 page_dev_env_desc3_desc=提供执行环境共享，一次配置，多次使用，降低模型开发门槛，避免花费重复的时间配置复杂的环境
 page_dev_yunlao=启智AI协作平台
-page_dev_yunlao_desc1=启智AI协作平台已经与鹏城云脑、中国算力网（C2Net）一期打通，可以利用鹏城云脑和中国算力网的丰富算力资源，完成AI开发任务。
-page_dev_yunlao_desc2=鹏城云脑现有AI算力100P FLOPS@FP16（每秒十亿亿次半精度浮点计算），主要硬件基础设施由搭载英伟达Tesla V100 和A100 的GPU服务器，以及搭载鲲鹏、昇腾处理器的Atlas 900 AI集群构成；中国算力网（C2Net）一期可实现不同人工智能计算中心之间高速网络互联，实现算力合理调度和资源弹性分配，目前已接入11家智算中心，算力总规模1924P。
-page_dev_yunlao_desc3=启智AI协作平台已接入其中的鹏城云计算所、成都智算中心、中原智算中心、合肥类脑等节点，开发者可以根据使用需求，自由选择相应计算资源，可以测试模型在不同硬件环境下的适配能力、性能、稳定性等。
-page_dev_yunlao_desc4=如果您的模型需要更多的计算资源，也可以单独申请。
+page_dev_yunlao_desc1=启智AI协作平台已经与鹏城云脑、中国算力网（C²NET）一期打通，可以利用鹏城云脑和中国算力网的丰富算力资源，完成AI开发任务。
+page_dev_yunlao_desc2=鹏城云脑现有AI算力100P FLOPS@FP16（每秒十亿亿次半精度浮点计算），主要硬件基础设施由搭载英伟达Tesla V100 和A100 的GPU服务器，以及搭载鲲鹏、昇腾处理器的Atlas 900 AI集群构成。
+page_dev_yunlao_desc3=中国算力网（C²NET）一期可实现不同人工智能计算中心之间高速网络互联，实现算力合理调度和资源弹性分配。目前已接入11家智算中心，算力总规模1924P OPS@FP16。启智AI协作平台已接入其中的鹏城云计算所、成都智算中心、中原智算中心、合肥类脑等节点。
+page_dev_yunlao_desc4=开发者可以根据使用需求，自由选择相应计算资源，可以测试模型在不同硬件环境下的适配能力、性能、稳定性等。
+page_dev_yunlao_desc5=如果您的模型需要更多的计算资源，也可以单独申请。
 page_dev_yunlao_apply=单独申请
 
 search=搜索

routers/home.go

@@ -40,7 +40,7 @@ const (
 	tplExploreImages              base.TplName = "explore/images"
 	tplExploreExploreDataAnalysis base.TplName = "explore/data_analysis"
 	tplHomeTerm                   base.TplName = "terms"
-	tplHomePrivacy       					base.TplName = "privacy"
+	tplHomePrivacy                base.TplName = "privacy"
 )
 
 // Home render home page
@@ -93,6 +93,7 @@ func setRecommendURL(ctx *context.Context) {
 	ctx.Data["page_dev_yunlao_desc2"] = ctx.Tr("home.page_dev_yunlao_desc2")
 	ctx.Data["page_dev_yunlao_desc3"] = ctx.Tr("home.page_dev_yunlao_desc3")
 	ctx.Data["page_dev_yunlao_desc4"] = ctx.Tr("home.page_dev_yunlao_desc4")
+	ctx.Data["page_dev_yunlao_desc5"] = ctx.Tr("home.page_dev_yunlao_desc5")
 	ctx.Data["page_dev_yunlao_apply"] = ctx.Tr("home.page_dev_yunlao_apply")
 	ctx.Data["page_recommend_activity"] = ctx.Tr("home.page_recommend_activity")
 	ctx.Data["page_recommend_activity_desc"] = ctx.Tr("home.page_recommend_activity_desc")

templates/admin/cloudbrain/list.tmpl

@@ -45,12 +45,12 @@
                                 <div class="one wide column text center nowrap" style="width:6% !important;">
                                     <span>{{$.i18n.Tr "repo.modelarts.cluster"}}</span>
                                 </div>
-                                <div class="one wide column text center nowrap" style="width:6% !important;">
-                                    <span>{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
-                                </div>
                                 <div class="two wide column text center nowrap" style="width: 6% !important;">
                                     <span>{{$.i18n.Tr "repo.modelarts.status"}}</span>
                                 </div>
+                                <div class="one wide column text center nowrap" style="width:6% !important;">
+                                    <span>{{$.i18n.Tr "repo.cloudbrain_task_type"}}</span>
+                                </div>
                                 <div class="two wide column text center nowrap" style="width: 8% !important;">
                                     <span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span>
                                 </div>

templates/home.tmpl

@@ -206,7 +206,8 @@
                     {{.page_dev_yunlao_desc1}}<br>
                     {{.page_dev_yunlao_desc2}}<br>
                     {{.page_dev_yunlao_desc3}}<br>
-                    {{.page_dev_yunlao_desc4}}<br>               
+                    {{.page_dev_yunlao_desc4}}<br>     
+                    {{.page_dev_yunlao_desc5}}<br>               
                     </p>
                     
                     {{if .IsSigned}}