From 3a26a12a5382bf4b1d51f746b2ef66156e337e80 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 5 Dec 2022 14:50:44 +0800 Subject: [PATCH 01/74] fix-3262 --- models/cloudbrain.go | 2 ++ modules/setting/setting.go | 1 + routers/repo/cloudbrain.go | 13 ++++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 1e7c702ab..b552ecde8 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -2424,6 +2424,7 @@ type DatasetInfo struct { DataLocalPath string Name string FullName string + Size int64 } func GetDatasetInfo(uuidStr string, grampusType ...string) (map[string]DatasetInfo, string, error) { @@ -2479,6 +2480,7 @@ func GetDatasetInfo(uuidStr string, grampusType ...string) (map[string]DatasetIn DataLocalPath: dataLocalPath, Name: fileName, FullName: attach.Name, + Size: attach.Size, } if i == 0 { datasetNames = attach.Name diff --git a/modules/setting/setting.go b/modules/setting/setting.go index a473dad6a..ed09de790 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -518,6 +518,7 @@ var ( MaxDatasetNum int CullIdleTimeout string CullInterval string + DebugDatasetSize int64 //benchmark config IsBenchmarkEnabled bool diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index d3d76f440..05376f138 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -293,6 +293,13 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form) return } + + if jobType == string(models.JobTypeDebug) { + for _, infos := range datasetInfos { + log.Info("the size of dataset", infos.Size) + } + + } } command := cloudbrain.GetCloudbrainDebugCommand() @@ -842,10 +849,10 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo func CloudBrainDebug(ctx *context.Context) { task := ctx.Cloudbrain debugUrl := setting.DebugServerHost + "jpylab_" + task.JobID + "_" + task.SubTaskName - if task.BootFile!=""{ - ctx.Redirect(getFileUrl(debugUrl,task.BootFile)) + if task.BootFile != "" { + ctx.Redirect(getFileUrl(debugUrl, task.BootFile)) - }else{ + } else { ctx.Redirect(debugUrl) } From 90a0ef946a4d5d634fb5ac9bed618f6b4e300078 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 5 Dec 2022 15:53:40 +0800 Subject: [PATCH 02/74] fix-3262 --- models/cloudbrain.go | 4 ++-- modules/setting/setting.go | 3 ++- routers/repo/cloudbrain.go | 11 +++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index b552ecde8..6652647dc 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -2424,7 +2424,7 @@ type DatasetInfo struct { DataLocalPath string Name string FullName string - Size int64 + Size int } func GetDatasetInfo(uuidStr string, grampusType ...string) (map[string]DatasetInfo, string, error) { @@ -2480,7 +2480,7 @@ func GetDatasetInfo(uuidStr string, grampusType ...string) (map[string]DatasetIn DataLocalPath: dataLocalPath, Name: fileName, FullName: attach.Name, - Size: attach.Size, + Size: int(attach.Size / (1024 * 1024 * 1024)), //GB } if i == 0 { datasetNames = attach.Name diff --git a/modules/setting/setting.go b/modules/setting/setting.go index ed09de790..5f4eeb53e 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -518,7 +518,7 @@ var ( MaxDatasetNum int CullIdleTimeout string CullInterval string - DebugDatasetSize int64 + DebugDatasetSize int //benchmark config IsBenchmarkEnabled bool @@ -1480,6 +1480,7 @@ func NewContext() { MaxDatasetNum = sec.Key("MAX_DATASET_NUM").MustInt(5) CullIdleTimeout = sec.Key("CULL_IDLE_TIMEOUT").MustString("900") CullInterval = sec.Key("CULL_INTERVAL").MustString("60") + DebugDatasetSize = sec.Key("DEBUG_DATASET_SIZE").MustInt(15) sec = Cfg.Section("benchmark") IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 05376f138..a01ef20e7 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -296,9 +296,16 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { if jobType == string(models.JobTypeDebug) { for _, infos := range datasetInfos { - log.Info("the size of dataset", infos.Size) + log.Info("the size of dataset(GB):", infos.Size) + + if infos.Size > int(setting.DebugDatasetSize) { + log.Info("datasize exceed limit:", infos.Size) + log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) + cloudBrainNewDataPrepare(ctx, jobType) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tpl, &form) + return + } } - } } From 3280eb2c126b5a6fe50a6597ffb3f0c625802b92 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 5 Dec 2022 16:05:06 +0800 Subject: [PATCH 03/74] fix-3262 --- options/locale/locale_zh-CN.ini | 2 +- routers/repo/cloudbrain.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 8f9e6b664..0c15605ff 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3304,7 +3304,7 @@ Stopped_failed=任务停止失败，请稍后再试。 Stopped_success_update_status_fail=任务停止成功，状态及运行时间更新失败。 load_code_failed=代码加载失败，请确认选择了正确的分支。 - +error.debug_datasetsize = 数据集大小超过限制（15GB） error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集 new_train_gpu_tooltips = 训练脚本存储在 %s 中，数据集存储在 %s 中，预训练模型存放在运行参数 %s 中，训练输出请存储在 %s 中以供后续下载。 new_train_npu_tooltips = 训练脚本存储在 %s 中，预训练模型存放在运行参数 %s 中，训练输出请存储在 %s 中以供后续下载。 diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index a01ef20e7..f91f224ab 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -296,10 +296,8 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { if jobType == string(models.JobTypeDebug) { for _, infos := range datasetInfos { - log.Info("the size of dataset(GB):", infos.Size) - if infos.Size > int(setting.DebugDatasetSize) { - log.Info("datasize exceed limit:", infos.Size) + log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) cloudBrainNewDataPrepare(ctx, jobType) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tpl, &form) From 2a77370d0216ca4361787b622038d5e7f955c714 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 5 Dec 2022 16:32:31 +0800 Subject: [PATCH 04/74] fix-3262 --- routers/repo/cloudbrain.go | 1 - routers/repo/modelarts.go | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index f91f224ab..64111ee04 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -284,7 +284,6 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { } var datasetInfos map[string]models.DatasetInfo var datasetNames string - //var if uuids != "" { datasetInfos, datasetNames, err = models.GetDatasetInfo(uuids) if err != nil { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 01d2e2fa4..52a4ea566 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -251,6 +251,21 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm ctx.RenderWithErr(err.Error(), tplModelArtsNotebookNew, &form) return } + + var datasetInfos map[string]models.DatasetInfo + if uuid != "" { + datasetInfos, _, err = models.GetDatasetInfo(uuid) + for _, infos := range datasetInfos { + if infos.Size > int(setting.DebugDatasetSize) { + log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) + log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) + notebookNewDataPrepare(ctx) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tplModelArtsNotebookNew, &form) + return + } + } + + } ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") } From 4a4a02cc9004d12a91a91c1d6141dbad14b6103d Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 5 Dec 2022 16:42:02 +0800 Subject: [PATCH 05/74] fix-3262 --- routers/repo/modelarts.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 52a4ea566..fed31618f 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -218,6 +218,22 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm return } } + + var datasetInfos map[string]models.DatasetInfo + if uuid != "" { + datasetInfos, _, err = models.GetDatasetInfo(uuid) + for _, infos := range datasetInfos { + if infos.Size > int(setting.DebugDatasetSize) { + log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) + log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) + notebookNewDataPrepare(ctx) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tplModelArtsNotebookNew, &form) + return + } + } + + } + var aiCenterCode = models.AICenterOfCloudBrainTwo if setting.ModelartsCD.Enabled { aiCenterCode = models.AICenterOfChengdu @@ -251,21 +267,6 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm ctx.RenderWithErr(err.Error(), tplModelArtsNotebookNew, &form) return } - - var datasetInfos map[string]models.DatasetInfo - if uuid != "" { - datasetInfos, _, err = models.GetDatasetInfo(uuid) - for _, infos := range datasetInfos { - if infos.Size > int(setting.DebugDatasetSize) { - log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) - log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) - notebookNewDataPrepare(ctx) - ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tplModelArtsNotebookNew, &form) - return - } - } - - } ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") } From 49e821d89e0f38c4a6e36f0f9143e55d0c8921db Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 6 Dec 2022 15:48:15 +0800 Subject: [PATCH 06/74] fix-3262 --- models/cloudbrain.go | 2 +- modules/setting/setting.go | 2 +- options/locale/locale_zh-CN.ini | 2 +- routers/repo/cloudbrain.go | 2 +- routers/repo/dataset.go | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 6652647dc..3dc8d9694 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -2480,7 +2480,7 @@ func GetDatasetInfo(uuidStr string, grampusType ...string) (map[string]DatasetIn DataLocalPath: dataLocalPath, Name: fileName, FullName: attach.Name, - Size: int(attach.Size / (1024 * 1024 * 1024)), //GB + Size: int(attach.Size), } if i == 0 { datasetNames = attach.Name diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 5f4eeb53e..05a2ba300 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1480,7 +1480,7 @@ func NewContext() { MaxDatasetNum = sec.Key("MAX_DATASET_NUM").MustInt(5) CullIdleTimeout = sec.Key("CULL_IDLE_TIMEOUT").MustString("900") CullInterval = sec.Key("CULL_INTERVAL").MustString("60") - DebugDatasetSize = sec.Key("DEBUG_DATASET_SIZE").MustInt(15) + DebugDatasetSize = sec.Key("DEBUG_DATASET_SIZE").MustInt(20 * 1024 * 1024 * 1024) sec = Cfg.Section("benchmark") IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 0c15605ff..e7adeea18 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3304,7 +3304,7 @@ Stopped_failed=任务停止失败，请稍后再试。 Stopped_success_update_status_fail=任务停止成功，状态及运行时间更新失败。 load_code_failed=代码加载失败，请确认选择了正确的分支。 -error.debug_datasetsize = 数据集大小超过限制（15GB） +error.debug_datasetsize = 数据集大小超过限制（20GB） error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集 new_train_gpu_tooltips = 训练脚本存储在 %s 中，数据集存储在 %s 中，预训练模型存放在运行参数 %s 中，训练输出请存储在 %s 中以供后续下载。 new_train_npu_tooltips = 训练脚本存储在 %s 中，预训练模型存放在运行参数 %s 中，训练输出请存储在 %s 中以供后续下载。 diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 64111ee04..eba6d79c9 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -297,7 +297,7 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { for _, infos := range datasetInfos { if infos.Size > int(setting.DebugDatasetSize) { log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) - log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) + log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize / (1024*1024*1024))) // GB cloudBrainNewDataPrepare(ctx, jobType) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tpl, &form) return diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 1f445492d..38f5c7f23 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -373,6 +373,7 @@ func datasetMultiple(ctx *context.Context, opts *models.SearchDatasetOptions) { } data, err := json.Marshal(datasets) + log.Info("datakey", string(data)) if err != nil { log.Error("json.Marshal failed:", err.Error()) ctx.JSON(200, map[string]string{ @@ -521,6 +522,8 @@ func GetDatasetStatus(ctx *context.Context) { return } + log.Info(fmt.Sprint(attachment.DecompressState)) + ctx.JSON(200, map[string]string{ "result_code": "0", "UUID": UUID, From bbf4d0623f88ca61691c159a3d89852152e1d9a9 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 7 Dec 2022 09:45:36 +0800 Subject: [PATCH 07/74] =?UTF-8?q?=E9=99=90=E5=88=B6=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/setting/setting.go | 4 ++-- modules/templates/helper.go | 5 ++++- routers/repo/cloudbrain.go | 4 ++-- routers/repo/dataset.go | 2 -- routers/repo/modelarts.go | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 05a2ba300..b9b0f756e 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -518,7 +518,7 @@ var ( MaxDatasetNum int CullIdleTimeout string CullInterval string - DebugDatasetSize int + DebugAttachSize int //benchmark config IsBenchmarkEnabled bool @@ -1480,7 +1480,7 @@ func NewContext() { MaxDatasetNum = sec.Key("MAX_DATASET_NUM").MustInt(5) CullIdleTimeout = sec.Key("CULL_IDLE_TIMEOUT").MustString("900") CullInterval = sec.Key("CULL_INTERVAL").MustString("60") - DebugDatasetSize = sec.Key("DEBUG_DATASET_SIZE").MustInt(20 * 1024 * 1024 * 1024) + DebugAttachSize = sec.Key("DEBUG_DATASET_SIZE").MustInt(20 * 1024 * 1024 * 1024) sec = Cfg.Section("benchmark") IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index c314127f1..3ae028499 100755 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -97,6 +97,9 @@ func NewFuncMap() []template.FuncMap { "AllowedReactions": func() []string { return setting.UI.Reactions }, + "DebugAttachSize": func() int { + return setting.DebugAttachSize + }, "AvatarLink": models.AvatarLink, "Safe": Safe, "SafeJS": SafeJS, @@ -151,7 +154,7 @@ func NewFuncMap() []template.FuncMap { "EscapePound": func(str string) string { return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20", "?", "%3F").Replace(str) }, - "IpynbBool":func(str string) bool{ + "IpynbBool": func(str string) bool { return strings.Contains(str, ".ipynb") }, "nl2br": func(text string) template.HTML { diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index eba6d79c9..2cd6f3ee0 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -295,9 +295,9 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { if jobType == string(models.JobTypeDebug) { for _, infos := range datasetInfos { - if infos.Size > int(setting.DebugDatasetSize) { + if infos.Size > int(setting.DebugAttachSize) { log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) - log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize / (1024*1024*1024))) // GB + log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugAttachSize/(1024*1024*1024))) // GB cloudBrainNewDataPrepare(ctx, jobType) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tpl, &form) return diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 38f5c7f23..32c884b5e 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -522,8 +522,6 @@ func GetDatasetStatus(ctx *context.Context) { return } - log.Info(fmt.Sprint(attachment.DecompressState)) - ctx.JSON(200, map[string]string{ "result_code": "0", "UUID": UUID, diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index fed31618f..96e408a76 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -218,14 +218,14 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm return } } - + var datasetInfos map[string]models.DatasetInfo if uuid != "" { datasetInfos, _, err = models.GetDatasetInfo(uuid) for _, infos := range datasetInfos { - if infos.Size > int(setting.DebugDatasetSize) { + if infos.Size > int(setting.DebugAttachSize) { log.Info("datasize exceed limit, the size of dataset(GB)::", infos.Size) - log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugDatasetSize)) + log.Error("The DatasetSize exceeds the limit (%d)", int(setting.DebugAttachSize)) notebookNewDataPrepare(ctx) ctx.RenderWithErr(ctx.Tr("cloudbrain.error.debug_datasetsize"), tplModelArtsNotebookNew, &form) return From 8de31e8bf0c88b4ba85b8e1f41820b80f7e12a2e Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 7 Dec 2022 16:01:12 +0800 Subject: [PATCH 08/74] fix issue --- templates/repo/cloudbrain/new.tmpl | 4 +++- templates/repo/modelarts/notebook/new.tmpl | 2 +- web_src/js/components/dataset/selectDataset.vue | 30 +++++++++++++++++++++++++ web_src/js/features/i18nVue.js | 2 ++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index b75e75cdf..cb18517b3 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -23,7 +23,8 @@ {{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -216,6 +217,7 @@ {{template "base/footer" .}} + diff --git a/web_src/js/standalone/cloudbrainNew.js b/web_src/js/standalone/cloudbrainNew.js index bc54adc65..1823312db 100644 --- a/web_src/js/standalone/cloudbrainNew.js +++ b/web_src/js/standalone/cloudbrainNew.js @@ -6,7 +6,7 @@ if (createFlag) return false; createFlag = true; }; - $("select.dropdown").dropdown(); + // $("select.dropdown").dropdown(); $(document).keydown(function (event) { switch (event.keyCode) { case 13: @@ -182,4 +182,50 @@ } validate(); }); + + // 评测任务相关创建func + let repoLink = $(".cloudbrain-type").data("repo-link"); + function setChildType(type_id=1) { + if (type_id == 3) { + $('#train_href_id').attr('href', 'https://openi.pcl.ac.cn/CV_benchmark/CV_MOT_benchmark'); + $('#test_href_id').attr('href', 'https://openi.pcl.ac.cn/CV_benchmark/CV_MOT_benchmark'); + } else { + $('#train_href_id').attr('href', 'https://openi.pcl.ac.cn/CV_benchmark/CV_reID_benchmark'); + $('#test_href_id').attr('href', 'https://openi.pcl.ac.cn/CV_benchmark/CV_reID_benchmark'); + } + let child_selected_id = $('#benchmark_child_types_id_hidden').val(); + $.get(`${repoLink}/cloudbrain/benchmark/get_child_types?benchmark_type_id=${type_id}`, (data) => { + const n_length = data['child_types'].length + let html = '' + for (let i = 0; i < n_length; i++) { + if (child_selected_id == data['child_types'][i].id) { + html += ``; + } else { + html += ``; + } + } + document.getElementById("benchmark_child_types_id").innerHTML = html; + }) + } + $(document).ready(function () { + if ($('input[name=benchmarkMode]').val() === 'alogrithm' || $('input[name=benchmarkMode]').val() === '') { + setChildType(); + } + $(".ui.selection.dropdown.benchmark_types_id").dropdown({ + onChange:function (value, text, $selectedItem){ + setChildType(value) + } + }) + $('.ui.search.dropdown.job_type').dropdown({ + onChange: function (value, text, $selectedItem) { + if (value === "BRAINSCORE") { + $('#brainscore_child_type').css('display', 'block') + $('#benchmark_model_example').attr('href', 'https://openi.pcl.ac.cn/BDIP/similarity2brain_ann') + } else { + $('#brainscore_child_type').css('display', 'none') + $('#benchmark_model_example').attr('href', 'https://openi.pcl.ac.cn/BDIP/snn4imagenet') + } + } + }) + }) })(); From e6b3253add4985da944c968d4b98d2445de942cb Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 11:24:40 +0800 Subject: [PATCH 19/74] fix issue --- templates/repo/cloudbrain/benchmark/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 669fd42ab..3772d99f5 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -3,7 +3,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} From 3862ba6f0d0c18981f860fdf02979e535b40f3c4 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 15:10:21 +0800 Subject: [PATCH 20/74] fix issue --- options/locale/locale_en-US.ini | 4 ++-- options/locale/locale_zh-CN.ini | 4 ++-- templates/custom/task_wait_count.tmpl | 2 +- templates/repo/cloudbrain/trainjob/show.tmpl | 10 ++++++++++ templates/repo/grampus/trainjob/show.tmpl | 11 +++++++++++ templates/repo/modelarts/trainjob/show.tmpl | 11 +++++++++++ 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 702c17bce..84fd12d16 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1091,8 +1091,8 @@ image_delete_fail=Failed to delete image, please try again later. image_overwrite=You had submitted the same name image before, are you sure to overwrite the original image? download=Download score=Score -wait_count_start = There are currently -wait_count_end = tasks queued +wait_count_start = Your current queue position is +wait_count_end = file_limit_100 = Display up to 100 files or folders in a single directory images.name = Image Tag images.name_placerholder = Please enter the image name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index bf609ba14..dc85c5d27 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1090,8 +1090,8 @@ image_delete_fail=删除镜像失败，请稍后再试。 image_overwrite=您已经提交过相同名称的镜像，您确定要覆盖原来提交的镜像吗？ download=模型下载 score=评分 -wait_count_start = 当前有 -wait_count_end = 个任务正在排队 +wait_count_start = 您当前排队位置是第 +wait_count_end = 位 file_limit_100 = 单目录下最多显示100个文件或文件夹 images.name = 镜像Tag images.name_placerholder = 请输入镜像Tag diff --git a/templates/custom/task_wait_count.tmpl b/templates/custom/task_wait_count.tmpl index fb8ee71fb..4791327c5 100644 --- a/templates/custom/task_wait_count.tmpl +++ b/templates/custom/task_wait_count.tmpl @@ -12,7 +12,7 @@ var specsSelEl = $('select#__specs__'); var seldOption = specsSelEl.find('option:selected'); var queueCode = seldOption.attr('queueCode'); - $('span.__task_wait_count__').text(queuesDetail[queueCode] || 0); + $('span.__task_wait_count__').text(queuesDetail[queueCode]+1); }; $('body').on('change', 'select#__specs__', function(e) { changeSpecs(); diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 2a46d747e..6a83d3117 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -123,7 +123,17 @@
+ + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + +
+ {{.User.Name}} +
+ + {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 608bfd875..df8fbdb0e 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -123,6 +123,17 @@ + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + {{$.i18n.Tr "repo.modelarts.run_version"}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index a8ac1c4bf..57e97ba5c 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -159,6 +159,17 @@ + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + {{$.i18n.Tr "repo.modelarts.run_version"}} From 63f374b0199cbc5159c09565f59f7c2c116f9359 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 15:36:28 +0800 Subject: [PATCH 21/74] fix issue --- routers/repo/grampus.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index 14db1a50d..8f0871581 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -1239,7 +1239,7 @@ func GrampusTrainJobShow(ctx *context.Context) { return } task.ContainerIp = "" - + task.User, _ = models.GetUserByID(task.UserID) if task.DeletedAt.IsZero() { //normal record result, err := grampus.GetJob(task.JobID) if err != nil { @@ -1308,6 +1308,7 @@ func GrampusTrainJobShow(ctx *context.Context) { taskList := make([]*models.Cloudbrain, 0) taskList = append(taskList, task) prepareSpec4Show(ctx, task) + ctx.Data["version_list_task"] = taskList ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, task.DatasetName, false) ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) From a88ab8a2ac434eb89cd24c10a141f8d286a09565 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 15:39:27 +0800 Subject: [PATCH 22/74] fix issue --- models/user.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/user.go b/models/user.go index dad252d92..cb57b05e5 100755 --- a/models/user.go +++ b/models/user.go @@ -495,6 +495,9 @@ func (u *User) RealSizedAvatarLink(size int) string { // may either be a sub-URL to this site, or a full URL to an external avatar // service. func (u *User) RelAvatarLink() string { + if u.Avatar != "" { + return u.CustomAvatarPath() + } return u.SizedRelAvatarLink(base.DefaultAvatarSize) } From 437b465f316f7872a56835350a0da047ddd44295 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 21 Dec 2022 15:50:48 +0800 Subject: [PATCH 23/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=9B=BE=E5=83=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 7 ++++++- routers/repo/grampus.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/models/user.go b/models/user.go index dad252d92..91bbe8671 100755 --- a/models/user.go +++ b/models/user.go @@ -16,6 +16,7 @@ import ( "fmt" _ "image/jpeg" // Needed for jpeg support "image/png" + "math/rand" "os" "path/filepath" "regexp" @@ -495,7 +496,11 @@ func (u *User) RealSizedAvatarLink(size int) string { // may either be a sub-URL to this site, or a full URL to an external avatar // service. func (u *User) RelAvatarLink() string { - return u.SizedRelAvatarLink(base.DefaultAvatarSize) + append := "" + if u.Avatar != ""{ + append = "?" + fmt.Sprint(rand.Intn(100)) + } + return u.SizedRelAvatarLink(base.DefaultAvatarSize) + append } // AvatarLink returns user avatar absolute link. diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index 14db1a50d..fac4c5c36 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -1239,7 +1239,7 @@ func GrampusTrainJobShow(ctx *context.Context) { return } task.ContainerIp = "" - + task.User, _ = models.GetUserByID(task.UserID) if task.DeletedAt.IsZero() { //normal record result, err := grampus.GetJob(task.JobID) if err != nil { From d0d8bad140f6ec7762a88c786c21cf02c35ebc17 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 21 Dec 2022 15:55:31 +0800 Subject: [PATCH 24/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=9B=BE=E5=83=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 91bbe8671..d34860f2d 100755 --- a/models/user.go +++ b/models/user.go @@ -497,7 +497,7 @@ func (u *User) RealSizedAvatarLink(size int) string { // service. func (u *User) RelAvatarLink() string { append := "" - if u.Avatar != ""{ + if u.UseCustomAvatar { append = "?" + fmt.Sprint(rand.Intn(100)) } return u.SizedRelAvatarLink(base.DefaultAvatarSize) + append From 8c45b5865c50b5bc31d19bc5a2e6d021fd604d62 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:05:56 +0800 Subject: [PATCH 25/74] fix issue --- models/user.go | 3 --- templates/repo/cloudbrain/inference/new.tmpl | 2 +- templates/repo/cloudbrain/new.tmpl | 3 ++- templates/repo/cloudbrain/trainjob/new.tmpl | 2 +- templates/repo/grampus/notebook/gpu/new.tmpl | 2 +- templates/repo/modelsafety/new.tmpl | 2 +- web_src/js/features/cloudrbanin.js | 37 ---------------------------- 7 files changed, 6 insertions(+), 45 deletions(-) diff --git a/models/user.go b/models/user.go index cb57b05e5..dad252d92 100755 --- a/models/user.go +++ b/models/user.go @@ -495,9 +495,6 @@ func (u *User) RealSizedAvatarLink(size int) string { // may either be a sub-URL to this site, or a full URL to an external avatar // service. func (u *User) RelAvatarLink() string { - if u.Avatar != "" { - return u.CustomAvatarPath() - } return u.SizedRelAvatarLink(base.DefaultAvatarSize) } diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index feeac67cb..cab2035bc 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -40,7 +40,7 @@ {{template "base/alert" .}} {{end}} {{template "custom/alert_cb" .}} - +

{{.i18n.Tr "repo.modelarts.train_job.new_infer"}}

diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index b925f0e1b..e1ef73c85 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -23,7 +23,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -38,6 +38,7 @@
{{.CsrfTokenHtml}} +

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

diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index c572f72a6..804f2bde5 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -56,7 +56,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} diff --git a/templates/repo/grampus/notebook/gpu/new.tmpl b/templates/repo/grampus/notebook/gpu/new.tmpl index 4a752ec26..73878bf7b 100644 --- a/templates/repo/grampus/notebook/gpu/new.tmpl +++ b/templates/repo/grampus/notebook/gpu/new.tmpl @@ -5,7 +5,7 @@ {{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index d261c4dde..4fee33745 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -49,7 +49,7 @@ {{template "repo/header" .}}
{{$Grampus := (or (eq (index (SubJumpablePath .Link) 1) "create_grampus_gpu") (eq (index (SubJumpablePath .Link) 1) "create_grampus_npu"))}} - + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 840ea4940..775f63133 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -483,43 +483,6 @@ export default async function initCloudrain() { const redirect_to = this.dataset.linkpath; debugAgain(ID, repoPath, redirect_to); }); - - function setWaitNums() { - if ($(".cloudbrain-type").length === 0 && $(".gpu-type").length === 0) { - return; - } - if ( - $(".cloudbrain-type").length !== 0 && - !$(".cloudbrain-type").data("queue") - ) { - return; - } - let waitNums = $(".cloudbrain-type").data("queue").split("map")[1]; - let test = new Map(); - let waitNumsArray = waitNums.split(" "); - waitNumsArray.forEach((element, index) => { - if (index === 0) { - test.set(element.slice(1, -2), parseInt(element.slice(-1))); - } else if (index === waitNumsArray.length - 1) { - test.set(element.slice(0, -3), parseInt(element.slice(-2, -1))); - } else { - test.set(element.slice(0, -2), parseInt(element.slice(-1))); - } - }); - $(".ui.search.dropdown.gpu-type").dropdown({ - onChange: function (value, text, $selectedItem) { - let gpuTypeNums = test.get(value); - let gpuTypeNumString = - $(".cloudbrain-type").data("queue-start") + - " " + - gpuTypeNums + - " " + - $(".cloudbrain-type").data("queue-end"); - $("#gpu-nums").text(gpuTypeNumString); - }, - }); - } - setWaitNums(); } function userSearchControll() { From 79ebde98de94b5f0e3da864b7b6a7eb6e77f25c3 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:27:52 +0800 Subject: [PATCH 26/74] fix issue --- templates/repo/grampus/notebook/gpu/new.tmpl | 5 ++--- templates/repo/grampus/notebook/npu/new.tmpl | 17 +++++++++++++++-- templates/repo/modelarts/notebook/new.tmpl | 19 ++++++++++++++++--- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/templates/repo/grampus/notebook/gpu/new.tmpl b/templates/repo/grampus/notebook/gpu/new.tmpl index 73878bf7b..00d4f27d8 100644 --- a/templates/repo/grampus/notebook/gpu/new.tmpl +++ b/templates/repo/grampus/notebook/gpu/new.tmpl @@ -4,8 +4,7 @@
{{template "repo/header" .}}
- - + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -20,8 +19,8 @@ {{.CsrfTokenHtml}} +

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

-
diff --git a/templates/repo/grampus/notebook/npu/new.tmpl b/templates/repo/grampus/notebook/npu/new.tmpl index 0773cc346..f14f3618d 100644 --- a/templates/repo/grampus/notebook/npu/new.tmpl +++ b/templates/repo/grampus/notebook/npu/new.tmpl @@ -93,8 +93,21 @@
diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 1b3ea630a..2013be92b 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -4,7 +4,7 @@ {{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -77,8 +77,21 @@
From 31aa33f9211864248de64cba04845b8b29bea9fd Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:31:23 +0800 Subject: [PATCH 27/74] fix issue --- templates/repo/modelarts/notebook/new.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 2013be92b..34c86610f 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -79,18 +79,18 @@ From 98e0a770d4a95e2370747d9d11aa1cab7eadcda5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:47:28 +0800 Subject: [PATCH 28/74] fix issue --- modules/auth/modelarts.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/auth/modelarts.go b/modules/auth/modelarts.go index 0061648ce..874bbb0a4 100755 --- a/modules/auth/modelarts.go +++ b/modules/auth/modelarts.go @@ -28,6 +28,7 @@ type CreateModelArtsNotebookForm struct { LabelName string `form:"label_names"` PreTrainModelUrl string `form:"pre_train_model_url"` SpecId int64 `form:"spec_id" binding:"Required"` + DatasetName string `form:"dataset_name"` } func (f *CreateModelArtsNotebookForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { From b2265d00a1e63c777f9742a1ece99f4f7a0e9831 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:50:44 +0800 Subject: [PATCH 29/74] fix issue --- templates/repo/grampus/notebook/npu/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/grampus/notebook/npu/new.tmpl b/templates/repo/grampus/notebook/npu/new.tmpl index f14f3618d..9c52e2717 100644 --- a/templates/repo/grampus/notebook/npu/new.tmpl +++ b/templates/repo/grampus/notebook/npu/new.tmpl @@ -3,7 +3,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} From b0f18ff074e744fa37c8519a38299bd9ca8f2652 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 21 Dec 2022 17:35:47 +0800 Subject: [PATCH 30/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4diam?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 7508b70d3..6608736e8 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -2148,7 +2148,7 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) { } var jobTypes []string - jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet), string(models.JobTypeModelSafety)) + jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet), string(models.JobTypeSnn4Ecoset), string(models.JobTypeModelSafety)) ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ ListOptions: models.ListOptions{ Page: page, From 671b55c68965c31141e5640fb2a18955d30aa842 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 17:55:02 +0800 Subject: [PATCH 31/74] fix issue --- templates/repo/modelsafety/new.tmpl | 35 +----- web_src/js/features/cloudbrainShow.js | 196 --------------------------------- web_src/js/standalone/cloudbrainNew.js | 195 ++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 230 deletions(-) diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index 4fee33745..e259054b5 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -141,40 +141,7 @@ onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 255)">{{.description}}
- -
- -
- -
- -
- -
-
- -
- - - -
+ {{template "custom/select_model" .}}