Merge branch 'multi-dataset' of https://git.openi.org.cn/OpenI/aiforge into multi-dataset

routers/repo/cloudbrain.go

@@ -215,20 +215,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	resourceSpecId := form.ResourceSpecId
 	branchName := form.BranchName
 	repo := ctx.Repo.Repository
-
 	tpl := tplCloudBrainNew
-	command := cloudbrain.Command
-	if jobType == string(models.JobTypeTrain) {
-		tpl = tplCloudBrainTrainJobNew
-		commandTrain, err := getTrainJobCommand(form)
-		if err != nil {
-			log.Error("getTrainJobCommand failed: %v", err)
-			ctx.RenderWithErr(err.Error(), tpl, &form)
-			return
-		}
-
-		command = commandTrain
-	}
 
 	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, jobType, displayJobName)
 	if err == nil {
@@ -282,6 +269,19 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 		return
 	}
 
+	command := cloudbrain.Command
+	if jobType == string(models.JobTypeTrain) {
+		tpl = tplCloudBrainTrainJobNew
+		commandTrain, err := getTrainJobCommand(form, datasetNames)
+		if err != nil {
+			log.Error("getTrainJobCommand failed: %v", err)
+			ctx.RenderWithErr(err.Error(), tpl, &form)
+			return
+		}
+
+		command = commandTrain
+	}
+
 	if branchName == "" {
 		branchName = cloudbrain.DefaultBranchName
 	}
@@ -2246,7 +2246,7 @@ func CloudBrainTrainJobNew(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplCloudBrainTrainJobNew)
 }
 
-func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
+func getTrainJobCommand(form auth.CreateCloudBrainForm, datasetNames string) (string, error) {
 	var command string
 	bootFile := strings.TrimSpace(form.BootFile)
 	params := form.Params
@@ -2270,6 +2270,8 @@ func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
 		}
 	}
 
+	param += " --dataset_list=" + datasetNames
+
 	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + form.DisplayJobName + "-" + cloudbrain.LogFile
 
 	return command, nil

templates/repo/cloudbrain/new.tmpl

@@ -121,7 +121,7 @@
     {{template "repo/header" .}}
     <div class="repository new repo ui middle very relaxed page grid">
         <div class="column">
-            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.cloudbraintype}}" data-repo-link="{{.RepoLink}}"></div>
+            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
             {{template "base/alert" .}}
             <div class="ui negative message" id="messageInfo">
                 <p></p>

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -77,7 +77,7 @@
 <div class="repository">
     {{template "repo/header" .}}
     <div class="ui container">
-        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.cloudbraintype}}" data-repo-link="{{.RepoLink}}"></div>
+        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
         {{template "base/alert" .}}
         <h4 class="ui top attached header">
             {{.i18n.Tr "repo.modelarts.train_job.new"}}

templates/repo/modelarts/notebook/new.tmpl

@@ -18,7 +18,7 @@
     {{template "repo/header" .}}
     <div class="repository new repo ui middle very relaxed page grid">
         <div class="column">
-            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.cloudbraintype}}" data-repo-link="{{.RepoLink}}"></div>
+            <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
             {{template "base/alert" .}}
             <div class="ui negative message" id="messageInfo">
                     <p></p>

templates/repo/modelarts/trainjob/new.tmpl

@@ -72,7 +72,7 @@
 <div class="repository">
     {{template "repo/header" .}}
     <div class="ui container">
-        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.cloudbraintype}}" data-repo-link="{{.RepoLink}}"></div>
+        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}"></div>
         {{template "base/alert" .}}
         <h4 class="ui top attached header">
             {{.i18n.Tr "repo.modelarts.train_job.new"}}