From 16693644e35eb192c8ac69f5e5f5db3c0fc54e19 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 29 Jun 2022 15:55:28 +0800 Subject: [PATCH 1/3] debug --- routers/repo/cloudbrain.go | 2 +- templates/repo/cloudbrain/trainjob/new.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 98e1e6577..87302a49e 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -2270,7 +2270,7 @@ func getTrainJobCommand(form auth.CreateCloudBrainForm, fileNames string) (strin } } - param += " --dataset_list=" + fileNames + param += " --dataset_list='" + fileNames + "'" command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + form.DisplayJobName + "-" + cloudbrain.LogFile diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index 0d6659384..51c7bb5b3 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -97,7 +97,7 @@ {{.i18n.Tr "cloudbrain.resource_cluster_openi"}} - + {{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}(Beta) From 5efcb0f700526b22ced33abaf10243830677b97f Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 29 Jun 2022 15:57:03 +0800 Subject: [PATCH 2/3] fix issue --- templates/custom/select_dataset_train.tmpl | 4 +- templates/repo/cloudbrain/trainjob/new.tmpl | 2 +- templates/repo/grampus/trainjob/gpu/new.tmpl | 57 +-- templates/repo/grampus/trainjob/npu/new.tmpl | 62 +-- templates/repo/modelarts/notebook/show.tmpl | 76 ++-- templates/repo/modelarts/trainjob/new.tmpl | 13 +- web_src/js/components/dataset/selectDataset.vue | 126 ++++-- .../js/components/images/selectGrampusImages.vue | 490 ++++++++++++--------- web_src/js/components/images/selectImages.vue | 2 + 9 files changed, 485 insertions(+), 347 deletions(-) diff --git a/templates/custom/select_dataset_train.tmpl b/templates/custom/select_dataset_train.tmpl index e96bfa3a8..a6ad0d873 100755 --- a/templates/custom/select_dataset_train.tmpl +++ b/templates/custom/select_dataset_train.tmpl @@ -1,11 +1,11 @@ -
+
{{if or (.benchmarkMode) (.newInference)}}       {{else}}{{.i18n.Tr "dataset.dataset"}}    {{end}} {{else}} -     + {{end}} diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index 0d6659384..d1806cda0 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -91,7 +91,7 @@

{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:

- +
diff --git a/templates/repo/grampus/trainjob/gpu/new.tmpl b/templates/repo/grampus/trainjob/gpu/new.tmpl index 155f41d6e..7c272ce82 100755 --- a/templates/repo/grampus/trainjob/gpu/new.tmpl +++ b/templates/repo/grampus/trainjob/gpu/new.tmpl @@ -1,20 +1,15 @@ {{template "base/head" .}} - +
{{ data.Description }}
{{ node.label }} + >
+ {{ node.label }} + +
{{ node.label }} + >
+ {{ + node.label + }} + +
- +
{{ data.Description }}
{{ node.label }} + >
+ {{ node.label }} + +
{{ node.label }} + >
+ {{ + node.label + }} + +
- +
{{ data.Description }}
{{ node.label }} + >
+ {{ node.label }} + +
{{ node.label }} + >
+ {{ + node.label + }} + +
- - -       - - - 选择镜像 - - -
- - +
+ + + + + 选择镜像 + + +
+ + +
+ + +
+ - - -
-
-
-
- {{publicData.tag}} - -
- -
- {{topic}} -
-
-
- - - - - {{publicData.description}} -
-
-
- -
-
-
- - -
- - - -
- - - +
+ +
+
+
+ + +
+ + + +
\ No newline at end of file +.header-wrapper { + background-color: #f5f5f6; + padding-top: 15px; +} + +.image_text { + padding: 25px 0 55px 0; +} + +#header { + position: relative; + top: -40px; +} + +#success { + background-color: #5bb973; + color: white; +} + +.text-over { + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + white-space: nowrap; +} + +.image_title { + display: inline-block; + width: 80%; + cursor: default; + color: rgb(66, 98, 144); +} + +.image_desc { + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + display: -webkit-box; + text-overflow: ellipsis; + overflow: hidden; +} + +.heart-stroke { + stroke: #666; + stroke-width: 2; + fill: #fff; +} + +.stars_active { + fill: #fa8c16 !important; + stroke: #fa8c16 !important; +} + diff --git a/web_src/js/components/images/selectImages.vue b/web_src/js/components/images/selectImages.vue index b5268a784..148b98890 100755 --- a/web_src/js/components/images/selectImages.vue +++ b/web_src/js/components/images/selectImages.vue @@ -18,6 +18,7 @@ :value="imageAddress" style="width: 48.5%" placeholder="选择镜像或输入镜像地址" + required /> Date: Wed, 29 Jun 2022 17:16:18 +0800 Subject: [PATCH 3/3] fix issue --- web_src/js/components/dataset/selectDataset.vue | 80 ++++++++++++++----------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index cba334b4f..73bf40bff 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -239,19 +239,23 @@ />
- {{ data.Repo.OwnerName }}/{{ data.Repo.Alias }} - + @click.stop="return false;" + > + {{ data.Repo.OwnerName }}/{{ data.Repo.Alias }} + @@ -341,19 +345,23 @@ />
- {{ data.Repo.OwnerName }}/{{ data.Repo.Alias }} + {{ data.Repo.OwnerName }}/{{ data.Repo.Alias }} + @@ -443,19 +451,23 @@ />
- {{ data.Repo.OwnerName }}/{{ data.Repo.Alias }} + {{ data.Repo.OwnerName }}/{{ data.Repo.Alias }} +