From e3be711d0720101d0c2c14eb4b95df2fc3e7ec5b Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Sun, 24 Apr 2022 15:08:08 +0800 Subject: [PATCH 1/8] fix issue --- templates/repo/cloudbrain/show.tmpl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 5fabaa937..932a588c3 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 380px; + min-height: 420px; margin-left: 10px; } .ac-grid { @@ -291,6 +291,16 @@ td, th { + {{$.i18n.Tr "repo.modelarts.code_version"}} + + +
+ {{.BranchName}} +
+ + + + {{$.i18n.Tr "cloudbrain.gpu_type"}} From 5002a893121aa194344f991c57454e7b19b8fb67 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Sun, 24 Apr 2022 16:43:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/dataset.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/dataset.go b/models/dataset.go index e841261c7..d3a142742 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -155,10 +155,6 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond { if opts.RepoID > 0 { cond = cond.And(builder.Eq{"dataset.repo_id": opts.RepoID}) } - if opts.RecommendOnly { - cond = cond.And(builder.Eq{"dataset.recommend": opts.RecommendOnly}) - } - if opts.IncludePublic { cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic}) cond = cond.And(builder.Eq{"attachment.is_private": false}) @@ -197,6 +193,10 @@ func generateFilterCond(opts *SearchDatasetOptions, cond builder.Cond) builder.C cond = cond.And(builder.Eq{"dataset.license": opts.License}) } + if opts.RecommendOnly { + cond = cond.And(builder.Eq{"dataset.recommend": opts.RecommendOnly}) + } + return cond } From 82c591c4a8a1e60dbe9dbde0ef0e47d13151d74c Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Sun, 24 Apr 2022 18:02:05 +0800 Subject: [PATCH 3/8] #1982 fix bug --- routers/repo/modelarts.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index b713f385f..5e9217b4b 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -51,6 +51,9 @@ const ( func DebugJobIndex(ctx *context.Context) { listType := ctx.Query("debugListType") + if listType == "" { + listType = models.AllResource + } ctx.Data["ListType"] = listType MustEnableCloudbrain(ctx) repo := ctx.Repo.Repository From fac91851f95edc0f1617a7c434b253864e8289d5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Sun, 24 Apr 2022 18:04:07 +0800 Subject: [PATCH 4/8] fix issue --- .../admin/cloudbrain/{images.html => images.tmpl} | 0 templates/repo/modelarts/trainjob/show.tmpl | 30 ++++++++++++++-------- web_src/js/components/images/adminImages.vue | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) rename templates/admin/cloudbrain/{images.html => images.tmpl} (100%) diff --git a/templates/admin/cloudbrain/images.html b/templates/admin/cloudbrain/images.tmpl similarity index 100% rename from templates/admin/cloudbrain/images.html rename to templates/admin/cloudbrain/images.tmpl diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 92f98939e..263abb05c 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -844,7 +844,8 @@ td, th { let scrollHeight = container.scrollHeight let clientHeight = container.clientHeight let scrollLeft = container.scrollLeft - if((parseInt(scrollTop) + clientHeight == scrollHeight || parseInt(scrollTop) + clientHeight +1 == scrollHeight || parseInt(scrollTop) + clientHeight - 1 == scrollHeight) && (scrollLeft===0)){ + console.log(parseInt(scrollTop),clientHeight,scrollHeight) + if(((parseInt(scrollTop) + clientHeight == scrollHeight || parseInt(scrollTop) + clientHeight +1 == scrollHeight || parseInt(scrollTop) + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0){ let end_line = $(`#log${version_name} input[name=end_line]`).val() $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => { if (data.Lines == 0){ @@ -868,7 +869,7 @@ td, th { }); } - if(scrollTop == 1 && scrollLeft==0){ + if([1,2,3,4,5].includes(scrollTop) && scrollLeft==0){ let start_line = $(`#log${version_name} input[name=start_line]`).val() $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => { @@ -897,7 +898,6 @@ td, th { const dist = Math.ceil(needScrollTop / 10); _currentY += dist; //移动一个十分之一 - console.log(_currentY, targetY) dom.scrollTo(currentX || 0, _currentY); // 如果移动幅度小于十个像素，直接移动，否则递归调用，实现动画效果 if (needScrollTop > 10 || needScrollTop < -10) { @@ -909,24 +909,34 @@ td, th { } $('.log_top').click(function(){ - let logContentDom = document.querySelector('.log') - if(!logContentDom) - return - let version_name = $('.log_top').data('version') + // let logContentDom = document.querySelector('.log') + // if(!logContentDom) + // return + // let version_name = $('.log_top').data('version') + let version_name = $(this).data('version') + let logContentDom = document.querySelector(`#log${version_name}`) + $(`#log_file${version_name}`).siblings('pre').remove() $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=&lines=50&order=asc`, (data) => { $(`#log${version_name} input[name=end_line]`).val(data.EndLine) //如果变动就改变所对应的值 $(`#log${version_name} input[name=start_line]`).val(data.StartLine) $(`#log${version_name}`).prepend('
' + data.Content)
+            $(`.message${version_name} #header`).text('您已翻阅至日志顶部')
+            $(`.message${version_name}`).css('display', 'block')
+            setTimeout(function(){
+                $(`.message${version_name}`).css('display', 'none')
+            }, 1000)
             scrollAnimation(logContentDom, logContentDom.scrollTop, 0);
         })
 
     })
-    $('.log_bottom').click(function(){
+    $('.log_bottom').click(function(e){
         
-        let logContentDom = document.querySelector('.log')
-        let version_name = $('.log_bottom').data('version')
+        console.log($(this).data('version'))
+        let version_name = $(this).data('version')
+        let logContentDom = document.querySelector(`#log${version_name}`)
+        console.log(version_name)
         console.log($(`#log${version_name}`).siblings('pre'))
         $(`#log_file${version_name}`).siblings('pre').remove()
         $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=&lines=50&order=desc`, (data) => {
diff --git a/web_src/js/components/images/adminImages.vue b/web_src/js/components/images/adminImages.vue
index 3b372114c..417d4e530 100644
--- a/web_src/js/components/images/adminImages.vue
+++ b/web_src/js/components/images/adminImages.vue
@@ -22,7 +22,7 @@
                         
                             全部
                             公开
-                            私有
+                            私有
                         
                          
             

From 016fcf5f1e5a194a44387a510b67beda8485a771 Mon Sep 17 00:00:00 2001
From: zhoupzh 
Date: Sun, 24 Apr 2022 18:06:47 +0800
Subject: [PATCH 5/8] fix issue

---
 templates/repo/modelarts/trainjob/show.tmpl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 263abb05c..c0a37e157 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -844,7 +844,6 @@ td, th {
         let scrollHeight = container.scrollHeight
         let clientHeight = container.clientHeight
         let scrollLeft = container.scrollLeft
-        console.log(parseInt(scrollTop),clientHeight,scrollHeight)
         if(((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0){
             let end_line = $(`#log${version_name} input[name=end_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => {
@@ -873,7 +872,6 @@ td, th {
             
             let start_line = $(`#log${version_name} input[name=start_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => {
-                console.log("11111")
                 if (data.Lines == 0){
                     $(`.message${version_name} #header`).text('您已翻阅至日志顶部')
                     $(`.message${version_name}`).css('display', 'block')
@@ -932,12 +930,8 @@ td, th {
 
     })
     $('.log_bottom').click(function(e){
-        
-        console.log($(this).data('version'))
         let version_name = $(this).data('version')
         let logContentDom = document.querySelector(`#log${version_name}`)
-        console.log(version_name)
-        console.log($(`#log${version_name}`).siblings('pre'))
         $(`#log_file${version_name}`).siblings('pre').remove()
         $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=&lines=50&order=desc`, (data) => {
             

From 4e0b06a512e5dd3ca3654715809d6dd99fc20ed3 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Mon, 25 Apr 2022 09:54:01 +0800
Subject: [PATCH 6/8] no duration limit for train job

---
 routers/repo/cloudbrain.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 4ef205af2..41826d0c5 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -40,13 +40,11 @@ const (
 	tplCloudBrainBenchmarkNew   base.TplName = "repo/cloudbrain/benchmark/new"
 	tplCloudBrainBenchmarkShow  base.TplName = "repo/cloudbrain/benchmark/show"
 
-	tplCloudBrainImageSubmit    base.TplName = "repo/cloudbrain/image/submit"
-	tplCloudBrainImageEdit      base.TplName = "repo/cloudbrain/image/edit"
-
+	tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit"
+	tplCloudBrainImageEdit   base.TplName = "repo/cloudbrain/image/edit"
 
 	tplCloudBrainTrainJobNew  base.TplName = "repo/cloudbrain/trainjob/new"
 	tplCloudBrainTrainJobShow base.TplName = "repo/cloudbrain/trainjob/show"
-
 )
 
 var (
@@ -1402,11 +1400,11 @@ func SyncCloudbrainStatus() {
 						maxDuration = setting.MaxDuration
 					}
 
-					if task.Duration >= maxDuration {
-						log.Info("begin to stop job(%s), because of the duration", task.JobName)
+					if task.Duration >= maxDuration && task.JobType != string(models.JobTypeTrain) {
+						log.Info("begin to stop job(%s), because of the duration", task.DisplayJobName)
 						err = cloudbrain.StopJob(task.JobID)
 						if err != nil {
-							log.Error("StopJob(%s) failed:%v", task.JobName, err)
+							log.Error("StopJob(%s) failed:%v", task.DisplayJobName, err)
 							continue
 						}
 						task.Status = string(models.JobStopped)
@@ -1416,7 +1414,8 @@ func SyncCloudbrainStatus() {
 						task.ComputeAndSetDuration()
 						err = models.UpdateJob(task)
 						if err != nil {
-							log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
+							log.Error("UpdateJob(%s) failed:%v", task.DisplayJobName, err)
+							continue
 						}
 					}
 				}

From 19d616a03a9ee4d278e2ce8291c86825a00a98a6 Mon Sep 17 00:00:00 2001
From: liuzx 
Date: Mon, 25 Apr 2022 10:34:32 +0800
Subject: [PATCH 7/8] fix-bug

---
 routers/repo/cloudbrain.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 4ef205af2..ea761cb83 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -601,6 +601,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 	ctx.Data["dataset_path"] = cloudbrain.DataSetMountPath
 	ctx.Data["model_path"] = cloudbrain.ModelMountPath
 	ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task)
+	ctx.Data["branchName"] = task.BranchName
 	ctx.HTML(200, tpName)
 }
 

From 230fa8bdd27bc49a184e580c12e89373e9d8758e Mon Sep 17 00:00:00 2001
From: zhoupzh 
Date: Mon, 25 Apr 2022 11:02:32 +0800
Subject: [PATCH 8/8] fix issu

---
 templates/repo/modelarts/trainjob/show.tmpl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index c0a37e157..36d1529c2 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -838,13 +838,12 @@ td, th {
     }
 
     function logScroll(version_name) {
-
         let container = document.querySelector(`#log${version_name}`)
         let scrollTop = container.scrollTop
         let scrollHeight = container.scrollHeight
         let clientHeight = container.clientHeight
         let scrollLeft = container.scrollLeft
-        if(((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0){
+        if(((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0 && scrollLeft==0){
             let end_line = $(`#log${version_name} input[name=end_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => {
                 if (data.Lines == 0){
@@ -867,8 +866,7 @@ td, th {
                 console.log(err);
             });
         }
-
-        if([1,2,3,4,5].includes(scrollTop) && scrollLeft==0){
+        if([0,1,2,3,4,5,6,7,8,9,10].includes(scrollTop) && scrollLeft==0){
             
             let start_line = $(`#log${version_name} input[name=start_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => {