Merge remote-tracking branch 'origin/V20220830' into zouap

options/locale/locale_en-US.ini

@@ -3178,7 +3178,7 @@ resource_use=Resource Occupancy
 
 job_name_rule = Please enter letters, numbers, _ and - up to 64 characters and cannot end with a dash (-).
 train_dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">train_url</strong>.
-infer_dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">train_url</strong>.
+infer_dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">result_url</strong>.
 view_sample = View sample
 inference_output_path_rule = The inference output path is stored in the environment variable result_url.
 model_file_path_rule=The model file location is stored in the environment variable ckpt_url
@@ -3212,3 +3212,4 @@ load_code_failed=Fail to load code, please check if the right branch is selected
 
 error.dataset_select = dataset select error：the count exceed the limit or has same name
 new_train_gpu_tooltips = The code is storaged in <strong style="color:#010101">%s</strong>, the dataset is storaged in <strong style="color:#010101">%s</strong>, and please put your model into <strong style="color:#010101">%s</strong> then you can download it online
+new_infer_gpu_tooltips = The dataset is stored in <strong style="color:#010101">%s</strong>, the model file is stored in <strong style="color:#010101">%s</strong>, please store the inference output in <strong style="color:#010101">%s</strong> for subsequent downloads.

options/locale/locale_zh-CN.ini

@@ -3195,7 +3195,7 @@ wrong_specification=您目前不能使用这个资源规格，请选择其他资
 
 job_name_rule = 请输入字母、数字、_和-，最长64个字符，且不能以中划线（-）结尾。
 train_dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，训练输出路径存储在环境变量<strong style="color:#010101">train_url</strong>中。
-infer_dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，推理输出路径存储在环境变量<strong style="color:#010101">train_url</strong>中。
+infer_dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，推理输出路径存储在环境变量<strong style="color:#010101">result_url</strong>中。
 view_sample = 查看样例
 inference_output_path_rule = 推理输出路径存储在环境变量result_url中。
 model_file_path_rule = 模型文件位置存储在环境变量ckpt_url中。
@@ -3230,3 +3230,4 @@ load_code_failed=代码加载失败，请确认选择了正确的分支。
 
 error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集
 new_train_gpu_tooltips =训练脚本存储在<strong style="color:#010101">%s</strong>中，数据集存储在<strong style="color:#010101">%s</strong>中，训练输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
+new_infer_gpu_tooltips = 数据集存储在<strong style="color:#010101">%s</strong>中，模型文件存储在<strong style="color:#010101">%s</strong>中，推理输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。

templates/repo/cloudbrain/inference/new.tmpl

@@ -83,6 +83,10 @@
                             Ascend NPU</a>
                     </div>
                     {{template "custom/wait_count_train" Dict "ctx" $ "type" .inference_gpu_types}}
+                    <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                        <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.new_infer_gpu_tooltips" "/dataset" "/model" "/result" | Safe}}</span>
+                    </div>
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>

templates/repo/modelarts/inferencejob/new.tmpl

@@ -277,7 +277,6 @@
                     <div class="ui labeled input" style="width: 5%;">
                         <input style="border-radius: 0;text-align: center;" name="work_server_number" id="trainjob_work_server_num" tabindex="3" autofocus required maxlength="255" value="1" readonly>
                     </div>
-                    <span class="tooltips" style="margin-left: 11.5rem;display: block;">{{.i18n.Tr "cloudbrain.inference_output_path_rule"}}</span>
                 </div>
                 <!-- 表单操作 -->
                 <div class="inline min_title field">