add log mask

modules/grampus/grampus.go

@@ -10,32 +10,7 @@ import (
 )
 
 const (
-	storageTypeOBS = "obs"
-
-	WorkPath         = "/home/ma-user/work"
-	CodePath         = "/code/"
-	DatasetPath      = "/dataset"
-	OutputPath       = "/output/"
-	ResultPath       = "/result/"
-	LogPath          = "/log/"
-	JobPath          = "job/"
-	OrderDesc        = "desc" //向下查询
-	OrderAsc         = "asc"  //向上查询
-	Lines            = 500
-	TrainUrl         = "train_url"
-	DataUrl          = "data_url"
-	ResultUrl        = "result_url"
-	CkptUrl          = "ckpt_url"
-	DeviceTarget     = "device_target"
-	Ascend           = "Ascend"
-	PerPage          = 10
-	IsLatestVersion  = "1"
-	NotLatestVersion = "0"
-	VersionCount     = 1
-
-	SortByCreateTime  = "create_time"
-	ConfigTypeCustom  = "custom"
-	TotalVersionCount = 1
+	JobPath = "job/"
 
 	ProcessorTypeNPU = "npu.huawei.com/NPU"
 	ProcessorTypeGPU = "nvidia.com/gpu"

modules/grampus/resty.go

@@ -20,14 +20,10 @@ var (
 const (
 	urlOpenApiV1 = "/openapi/v1/"
 
-	urlGetToken          = urlOpenApiV1 + "token"
-	urlTrainJob          = urlOpenApiV1 + "trainjob"
-	urlGetResourceSpecs  = urlOpenApiV1 + "resourcespec"
-	urlGetImages         = urlOpenApiV1 + "image"
-	urlTrainJobConfig    = "/training-job-configs"
-	errorCodeExceedLimit = "ModelArts.0118"
-
-	urlNotebook2 = ""
+	urlGetToken         = urlOpenApiV1 + "token"
+	urlTrainJob         = urlOpenApiV1 + "trainjob"
+	urlGetResourceSpecs = urlOpenApiV1 + "resourcespec"
+	urlGetImages        = urlOpenApiV1 + "image"
 
 	errorIllegalToken = 1005
 )

routers/routes/routes.go

@@ -1091,7 +1091,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Group("/gpu", func() {
 					m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.GrampusTrainJobGPUNew)
-					m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.GrampusTrainJobCreate)
+					//m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.GrampusTrainJobCreate)
 				})
 				m.Group("/npu", func() {
 					m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.GrampusTrainJobNPUNew)

templates/repo/grampus/trainjob/npu/new.tmpl

@@ -170,7 +170,7 @@
                         <span>
                             <i class="question circle icon  link" data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}} data-position="right center" data-variation="mini"></i>
                         </span>
-                        <a  href="https://git.openi.org.cn/OpenIOSSG/MINIST_Example" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
+                        <a  href="https://git.openi.org.cn/OpenIOSSG/MNIST_Example/src/branch/master/train_for_c2net.py" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
                 </div>
                 
                 {{template "custom/select_dataset_train" .}}

templates/repo/grampus/trainjob/show.tmpl

@@ -271,8 +271,8 @@
 
                         <a class="active item"
                             data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
-                        <a class="item log_bottom" data-tab="second{{$k}}"
-                            data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                        <a class="item" data-tab="second{{$k}}"
+                            onclick="loadLog({{.VersionName}})">{{$.i18n.Tr "repo.modelarts.log"}}</a>
                         <a class="item" data-tab="third{{$k}}"
                             onclick="loadModelFile({{.VersionName}},'','','init')">{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>
@@ -728,11 +728,14 @@
         });
     }
     function loadLog(version_name) {
+        document.getElementById("mask").style.display = "block"
         $.get(`/api/v1/repos/${userName}/${repoPath}/grampus/train-job/${jobID}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
             $('input[name=end_line]').val(data.EndLine)
             $('input[name=start_line]').val(data.StartLine)
             $(`#log_file${version_name}`).text(data.Content)
+            document.getElementById("mask").style.display = "none"
         }).fail(function (err) {
+            document.getElementById("mask").style.display = "none"
             console.log(err);
         });
     }