code review

modules/cloudbrain/cloudbrain.go

@@ -149,7 +149,7 @@ func AdminOrJobCreaterRightForTrain(ctx *context.Context) {
 
 }
 
-func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, brainScorePath, jobType, gpuQueue, description, branchName string, benchmarkTypeID, benchmarkChildTypeID, resourceSpecId int) error {
+func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command, uuid, codePath, modelPath, benchmarkPath, snn4imagenetPath, brainScorePath, jobType, gpuQueue, description, branchName, bootFile, params string, benchmarkTypeID, benchmarkChildTypeID, resourceSpecId int) error {
 	dataActualPath := setting.Attachment.Minio.RealPath +
 		setting.Attachment.Minio.Bucket + "/" +
 		setting.Attachment.Minio.BasePath +
@@ -184,6 +184,12 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command,
 		return errors.New("no such resourceSpec")
 	}
 
+	attach, err := models.GetAttachmentByUUID(uuid)
+	if err != nil {
+		log.Error("GetAttachmentByUUID failed:%v", err)
+		return err
+	}
+
 	jobResult, err := CreateJob(jobName, models.CreateJobParams{
 		JobName:    jobName,
 		RetryCount: 1,
@@ -281,6 +287,9 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command,
 		IsLatestVersion:      "1",
 		VersionCount:         versionCount,
 		BranchName:           branchName,
+		BootFile:			  bootFile,
+		DatasetName: 		  attach.Name,
+		Parameters:			  params,
 	})
 
 	if err != nil {

routers/repo/cloudbrain.go

@@ -300,7 +300,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	err = cloudbrain.GenerateTask(ctx, displayJobName, jobName, image, command, uuid, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"), storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
-		storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), jobType, gpuQueue, form.Description, branchName,
+		storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), jobType, gpuQueue, form.Description, branchName, form.BootFile, form.Params,
 		0, 0, resourceSpecId)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
@@ -475,6 +475,29 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 		task.TrainJobDuration = models.ConvertDurationToStr(duration)
 	}
 	ctx.Data["duration"] = task.TrainJobDuration
+
+	if len(task.Parameters) > 0 {
+		var parameters models.Parameters
+
+		err := json.Unmarshal([]byte(task.Parameters), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal Parameters: %s (%v)", task.Parameters, err)
+			task.Parameters = ""
+		} else {
+			if len(parameters.Parameter) > 0 {
+				paramTemp := ""
+				for _, Parameter := range parameters.Parameter {
+					param := Parameter.Label + " = " + Parameter.Value + "; "
+					paramTemp = paramTemp + param
+				}
+				task.Parameters = paramTemp[:len(paramTemp)-2]
+			} else {
+				task.Parameters = ""
+			}
+		}
+
+	}
+
 	ctx.Data["task"] = task
 	ctx.Data["jobName"] = task.JobName
 	ctx.Data["displayJobName"] = task.DisplayJobName
@@ -1429,7 +1452,7 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF
 	err = cloudbrain.GenerateTask(ctx, displayJobName, jobName, image, command, childInfo.Attachment, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"), storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
-		storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), string(models.JobTypeBenchmark), gpuQueue, form.Description, cloudbrain.DefaultBranchName,
+		storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"), string(models.JobTypeBenchmark), gpuQueue, form.Description, cloudbrain.DefaultBranchName, "", "",
 		benchmarkTypeID, benchmarkChildTypeID, resourceSpecId)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
@@ -1488,7 +1511,7 @@ func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
 		}
 	}
 
-	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + cloudbrain.LogFile
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + form.DisplayJobName + "-" + cloudbrain.LogFile
 
 	return command, nil
 }

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -214,7 +214,7 @@ td, th {
                 <div class="content-pad">
                     <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
                         <a class="active item" data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
-                        <a class="item" data-tab="second{{$k}}" onclick="loadLog({{.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>
                     <div class="ui tab active" data-tab="first{{$k}}">
@@ -268,17 +268,18 @@ td, th {
                                                         </div>
                                                     </td>
                                                 </tr>
+                                                              
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        镜像 
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.standard"}} 
                                                     </td>
         
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                            {{.Image}}
+                                                        <div class="text-span text-span-w">
+                                                            {{$.resource_spec}}
                                                         </div>
                                                     </td>
-                                                </tr>                                                
+                                                </tr>                                
                                                 
                                             </tbody>
                                         </table>
@@ -286,19 +287,18 @@ td, th {
                                     <div class="ac-grid-col">
                                             <table class="ti-form">
                                                 <tbody class="ti-text-form">
-                                                                                                
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "repo.modelarts.train_job.description"}}  
+                                                            镜像 
                                                         </td>
-                
+            
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" title="{{.Description}}">
-                                                                {{.Description}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                                {{.Image}}
                                                             </div>
                                                         </td>
-                                                    </tr>
-
+                                                    </tr>                   
+                                                    
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                             {{$.i18n.Tr "repo.modelarts.code_version"}}
@@ -313,24 +313,48 @@ td, th {
 
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                                {{$.i18n.Tr "repo.modelarts.train_job.standard"}} 
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
                                                         </td>
-            
+
                                                         <td class="ti-text-form-content">
                                                             <div class="text-span text-span-w">
-                                                                {{$.resource_spec}}
+                                                                {{.BootFile}}
                                                             </div>
                                                         </td>
                                                     </tr>
 
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            创建者 
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}
                                                         </td>
-            
+
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                                {{.User.Name}}
+                                                            <div class="text-span text-span-w">
+                                                                {{.DatasetName}}
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+
+                                                    <tr class="ti-no-ng-animate">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80" >
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}
+                                                        </td>
+
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w" title="{{.Parameters}}">
+                                                                {{.Parameters}}
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+
+                                                    <tr class="ti-no-ng-animate">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.description"}}  
+                                                        </td>
+                
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w" title="{{.Description}}">
+                                                                {{.Description}}
                                                             </div>
                                                         </td>
                                                     </tr>