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

models/cloudbrain.go

@@ -71,6 +71,7 @@ const (
 	ModelArtsStopping     ModelArtsJobStatus = "STOPPING"       //停止中
 	ModelArtsStopped      ModelArtsJobStatus = "STOPPED"        //停止
 	ModelArtsUnavailable  ModelArtsJobStatus = "UNAVAILABLE"    //故障
+	ModelArtsDeleting     ModelArtsJobStatus = "DELETING"       //删除中
 	ModelArtsDeleted      ModelArtsJobStatus = "DELETED"        //已删除
 	ModelArtsResizing     ModelArtsJobStatus = "RESIZING"       //规格变更中
 	ModelArtsResizFailed  ModelArtsJobStatus = "RESIZE_FAILED"  //规格变更失败
@@ -1934,9 +1935,9 @@ func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) {
 
 func GetCloudbrainRunCountByRepoID(repoID int64) (int, error) {
 	count, err := x.In("status", JobWaiting, JobRunning, ModelArtsCreateQueue, ModelArtsCreating, ModelArtsStarting,
-		ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsRestarting, ModelArtsTrainJobInit,
+		ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsDeleting, ModelArtsRestarting, ModelArtsTrainJobInit,
 		ModelArtsTrainJobImageCreating, ModelArtsTrainJobSubmitTrying, ModelArtsTrainJobWaiting, ModelArtsTrainJobRunning, ModelArtsStopping, ModelArtsResizing,
-		ModelArtsTrainJobScaling, ModelArtsTrainJobCheckInit, ModelArtsTrainJobCheckRunning, ModelArtsTrainJobCheckRunningCompleted).And("repo_id = ?", repoID).Count(new(Cloudbrain))
+		ModelArtsTrainJobScaling, ModelArtsTrainJobCheckInit, ModelArtsTrainJobCheckRunning, ModelArtsTrainJobKilling, ModelArtsTrainJobCheckRunningCompleted).And("repo_id = ?", repoID).Count(new(Cloudbrain))
 	return int(count), err
 }
 

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -73,12 +73,50 @@
                 <input type="hidden" id="ai_engine_name" name="engine_names" value="">
                 <input type="hidden" id="ai_flaver_name" name="flaver_names" value="">
                 <input type="hidden" id="display_job_name" name="display_job_name" value="{{.display_job_name}}">
-                {{template "custom/wait_count_train" Dict "ctx" $}}
-                <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                
+                <h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:</h4>
+                <div class="required min_title inline field">
+                    <label class="" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_cluster"}}</label>
+                    <div class="ui blue mini menu compact selectcloudbrain">
+                        <a class="active item" href="javascript:void 0;" style="cursor:not-allowed;">
+                            <svg class="svg" sxmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"></path><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"></path></svg>
+                            {{.i18n.Tr "cloudbrain.resource_cluster_openi"}}
+                        </a>
+                        <a class="item" href="javascript:void 0;" style="cursor:not-allowed;background:rgba(0,0,0,.03);">
+                            <svg class="svg" sxmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"></path><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"></path></svg>
+                            {{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}(Beta)
+                        </a>
+                    </div>
+                </div>
+                <div class="required inline min_title field">
+                    <label class="" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
+                    <div class="ui blue mini menu compact selectcloudbrain">
+                        <a class="item" href="javascript:void 0;" style="cursor:not-allowed;background:rgba(0,0,0,.03);">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
+                            </svg>
+                            CPU/GPU
+                        </a>
+                        <a class="active item" href="javascript:void 0;" style="cursor:not-allowed;">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
+                            </svg>
+                            Ascend NPU</a>
+                    </div>                    
+                </div>
+                <div style="margin-top:-5px;">
+                    {{template "custom/wait_count_train" Dict "ctx" $}}
+                </div>
+                <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;margin-bottom: 1.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.train_dataset_path_rule" | Safe}}</span>
                 </div>
-                <h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:</h4>
                 <div class="required unite min_title inline field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
                     <input type="hidden" style="width: 60%;" name="job_name" id="job_name" value="{{.job_name}}">

web_src/js/components/dataset/selectDataset.vue

@@ -985,7 +985,10 @@ export default {
       let hasSelectDatasetName = $(".cloudbrain-type")
         .data("dataset-name")
         .split(";");
-      if (this.hasSelectDatasetList.length !== 0) {
+      if (
+        this.hasSelectDatasetList.length !== 0 &&
+        hasSelectDatasetName[0] !== ""
+      ) {
         this.saveStatusList = this.hasSelectDatasetList;
         this.checkList = hasSelectDatasetName;
         this.hasSelectDatasetList.forEach((item, index) => {