From 432edf6180ff26c1f10aeb5f296a1fc0091412d1 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Sep 2023 11:14:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?#4660=20=E5=A2=9E=E5=8A=A0=E6=B2=90?= =?UTF-8?q?=E6=9B=A6=E7=A7=91=E6=8A=80=E5=8A=A0=E9=80=9F=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/action.go | 4 ++ models/cloudbrain.go | 44 +++++++++++-------- models/task_config.go | 2 + .../task/grampus_notebook_task.go | 5 ++- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/models/action.go b/models/action.go index 242ea2ac4a..33b3b77a88 100755 --- a/models/action.go +++ b/models/action.go @@ -74,6 +74,8 @@ const ( ActionCreateGrampusGPUOnlineInferTask //45 ActionCreateGrampusDCUDebugTask //46 ActionCreateSuperComputeTask //47 + ActionCreateGrampusILUVATARDebugTask //48 + ActionCreateGrampusMETAXDebugTask //49 ) // Action represents user operation type and other information to @@ -427,6 +429,8 @@ func (a *Action) IsCloudbrainAction() bool { ActionCreateGrampusGCUDebugTask, ActionCreateGrampusDCUDebugTask, ActionCreateGrampusMLUDebugTask, + ActionCreateGrampusILUVATARDebugTask, + ActionCreateGrampusMETAXDebugTask, ActionCreateSuperComputeTask: return true } diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 152622d9ff..1c800484ab 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -155,19 +155,23 @@ const ( AICenterOfChengdu = "OpenIChengdu" //ComputeResource - GPU = "GPU" - NPU = "NPU" - GCU = "GCU" - MLU = "MLU" - DCU = "DCU" - CPU = "CPU" - - ProcessorTypeNPU = "npu.huawei.com/NPU" - ProcessorTypeGPU = "nvidia.com/gpu" - ProcessorTypeGCU = "enflame-tech.com/gcu" - ProcessorTypeMLU = "cambricon.com/mlu" - ProcessorTypeDCU = "ac.sugon.com/dcu" - ProcessorTypeCPU = "hpc/cpu" + GPU = "GPU" + NPU = "NPU" + GCU = "GCU" + MLU = "MLU" + DCU = "DCU" + CPU = "CPU" + ILUVATAR = "ILUVATAR" + METAX = "METAX" + + ProcessorTypeNPU = "npu.huawei.com/NPU" + ProcessorTypeGPU = "nvidia.com/gpu" + ProcessorTypeGCU = "enflame-tech.com/gcu" + ProcessorTypeMLU = "cambricon.com/mlu" + ProcessorTypeDCU = "ac.sugon.com/dcu" + ProcessorTypeCPU = "hpc/cpu" + ProcessorTypeILUVATAR = "iluvatar.com/iluvatar" + ProcessorTypeMETAX = "metax-tech.com" ) const CloudbrainTwoDefaultVersion = "/V0001" @@ -211,12 +215,14 @@ func GetComputeSourceStandardFormat(name string) string { } var ComputeSourceMap = map[string]*ComputeSource{ - GPU: {Name: GPU, CloudbrainFormat: GPUResource, FullName: ProcessorTypeGPU}, - NPU: {Name: NPU, FullName: ProcessorTypeNPU}, - GCU: {Name: GCU, FullName: ProcessorTypeGCU}, - MLU: {Name: MLU, FullName: ProcessorTypeMLU}, - DCU: {Name: DCU, FullName: ProcessorTypeDCU}, - CPU: {Name: CPU, FullName: ProcessorTypeCPU}, + GPU: {Name: GPU, CloudbrainFormat: GPUResource, FullName: ProcessorTypeGPU}, + NPU: {Name: NPU, FullName: ProcessorTypeNPU}, + GCU: {Name: GCU, FullName: ProcessorTypeGCU}, + MLU: {Name: MLU, FullName: ProcessorTypeMLU}, + DCU: {Name: DCU, FullName: ProcessorTypeDCU}, + CPU: {Name: CPU, FullName: ProcessorTypeCPU}, + ILUVATAR: {Name: ILUVATAR, FullName: ProcessorTypeILUVATAR}, + METAX: {Name: METAX, FullName: ProcessorTypeMETAX}, } const ( diff --git a/models/task_config.go b/models/task_config.go index c43a68b832..803795c88a 100644 --- a/models/task_config.go +++ b/models/task_config.go @@ -76,6 +76,8 @@ func GetTaskTypeFromAction(a ActionType) TaskType { ActionCreateGrampusGCUTrainTask, ActionCreateGrampusMLUDebugTask, ActionCreateGrampusDCUDebugTask, + ActionCreateGrampusILUVATARDebugTask, + ActionCreateGrampusMETAXDebugTask, ActionCreateSuperComputeTask, ActionCreateGrampusGPUOnlineInferTask, ActionCreateGrampusGPUTrainTask: diff --git a/services/ai_task_service/task/grampus_notebook_task.go b/services/ai_task_service/task/grampus_notebook_task.go index 36d8cd706d..2663be8d2c 100644 --- a/services/ai_task_service/task/grampus_notebook_task.go +++ b/services/ai_task_service/task/grampus_notebook_task.go @@ -132,7 +132,10 @@ func GetGrampusNoteBookConfig(opts entity.AITaskConfigKey) *entity.AITaskBaseCon config.ActionType = models.ActionCreateGrampusDCUDebugTask case models.CPU: config.ActionType = models.ActionCreateSuperComputeTask - + case models.ILUVATAR: + config.ActionType = models.ActionCreateGrampusILUVATARDebugTask + case models.METAX: + config.ActionType = models.ActionCreateGrampusMETAXDebugTask } config.IsActionUseJobId = false -- 2.34.1 From 8c09a890b9775b1a9ccd2d9336ba4a468864498e Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Sep 2023 11:43:11 +0800 Subject: [PATCH 2/9] #4660 fix bug --- models/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 1c800484ab..bb7de27052 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -171,7 +171,7 @@ const ( ProcessorTypeDCU = "ac.sugon.com/dcu" ProcessorTypeCPU = "hpc/cpu" ProcessorTypeILUVATAR = "iluvatar.com/iluvatar" - ProcessorTypeMETAX = "metax-tech.com" + ProcessorTypeMETAX = "metax-tech.com/metax" ) const CloudbrainTwoDefaultVersion = "/V0001" -- 2.34.1 From 24276d4890a136ba97ad8367123cf48f09d6d788 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Mon, 11 Sep 2023 11:45:25 +0800 Subject: [PATCH 3/9] =?UTF-8?q?add=20ILUVATAR=E3=80=81METAX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/cloudbrain/SpecSelect.vue | 8 +- web_src/vuepages/const/index.js | 2 +- web_src/vuepages/pages/cloudbrain/configs.js | 98 ++++++++++++++++++- 3 files changed, 100 insertions(+), 8 deletions(-) diff --git a/web_src/vuepages/components/cloudbrain/SpecSelect.vue b/web_src/vuepages/components/cloudbrain/SpecSelect.vue index 7d2ba7ebc8..28c864e9f1 100644 --- a/web_src/vuepages/components/cloudbrain/SpecSelect.vue +++ b/web_src/vuepages/components/cloudbrain/SpecSelect.vue @@ -11,11 +11,11 @@
-
{{ selIconType[0] }}
+
{{ selIconType[0] }}
-
{{ item.type[0] }}
+
{{ item.type[0] }}
 {{ item.specStr }} {{ item.pointStr }} @@ -298,7 +298,9 @@ export default { .NPU_icon, .GCU_icon, .MLU_icon, - .DCU_icon { + .DCU_icon, + .ILUVATAR_icon, + .METAX_icon { color: white; width: 22px; height: 22px; diff --git a/web_src/vuepages/const/index.js b/web_src/vuepages/const/index.js index a4680ef623..0448e343a7 100644 --- a/web_src/vuepages/const/index.js +++ b/web_src/vuepages/const/index.js @@ -11,7 +11,7 @@ export const JOB_TYPE = [{ k: 'DEBUG', v: i18n.t('debugTask') }, { k: 'TRAIN', v // 资源管理 export const CLUSTERS = [{ k: 'OpenI', v: i18n.t('resourcesManagement.OpenI') }, { k: 'C2Net', v: i18n.t('resourcesManagement.C2Net') }]; export const AI_CENTER = [{ k: 'OpenIOne', v: i18n.t('resourcesManagement.OpenIOne') }, { k: 'OpenITwo', v: i18n.t('resourcesManagement.OpenITwo') }, { k: 'OpenIChengdu', v: i18n.t('resourcesManagement.OpenIChengdu') }, { k: 'pclcci', v: i18n.t('resourcesManagement.pclcci') }, { k: 'hefei', v: i18n.t('resourcesManagement.hefeiCenter') }, { k: 'xuchang', v: i18n.t('resourcesManagement.xuchangCenter') }]; -export const COMPUTER_RESOURCES = [{ k: 'CPU', v: 'CPU' }, { k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }]; +export const COMPUTER_RESOURCES = [{ k: 'CPU', v: 'CPU' }, { k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR', v: 'ILUVATAR' }, { k: 'METAX', v: 'METAX' }]; export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'DCU', v: 'DCU' }]; export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.willOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }]; export const NETWORK_TYPE = [{ k: 1, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.noInternet')})` }, { k: 2, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.hasInternet')})` }]; diff --git a/web_src/vuepages/pages/cloudbrain/configs.js b/web_src/vuepages/pages/cloudbrain/configs.js index 3ffc7d5e85..cf800f800b 100644 --- a/web_src/vuepages/pages/cloudbrain/configs.js +++ b/web_src/vuepages/pages/cloudbrain/configs.js @@ -3,7 +3,7 @@ import { JOB_TYPE } from '~/const'; import { getListValueWithKey } from '~/utils'; const CLUSTERS = [{ k: 'OpenI', v: i18n.t('cloudbrainObj.openi') }, { k: 'C2Net', v: i18n.t('cloudbrainObj.c2net') }]; -const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'CPU/GPU' }, { k: 'NPU', v: 'Ascend NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }]; +const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'CPU/GPU' }, { k: 'NPU', v: 'Ascend NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR', v: 'ILUVATAR' }, { k: 'METAX', v: 'METAX' }]; const sortList = [ { k: '', v: i18n.t('all') }, @@ -11,7 +11,9 @@ const sortList = [ { k: 'NPU', v: 'NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, - { k: 'DCU', v: 'DCU' } + { k: 'DCU', v: 'DCU' }, + { k: 'ILUVATAR', v: 'ILUVATAR' }, + { k: 'METAX', v: 'METAX' }, ]; const getSortList = (typeList) => { @@ -80,7 +82,7 @@ export const CreatePageConfigs = { }], 'C2Net': [{ url: 'grampus/notebook/create?type=0', - computerResouces: ['GPU', 'NPU', 'GCU', 'MLU', 'DCU'], + computerResouces: ['GPU', 'NPU', 'GCU', 'MLU', 'DCU', 'ILUVATAR', 'METAX'], 'GPU': [{ url: 'grampus/notebook/create?type=0', clusterType: 'C2Net', @@ -173,6 +175,44 @@ export const CreatePageConfigs = { spec: { required: true }, }, }], + 'ILUVATAR': [{ + url: 'grampus/notebook/create?type=5', + clusterType: 'C2Net', + tips2: i18n.t('cloudbrainObj.pathTips3', { + code: '/tmp/code', + dataset: '/tmp/dataset', + model: '/tmp/pretrainmodel', + }), + form: { + taskName: { required: true, }, + taskDescr: { required: false, }, + branchName: { required: true, }, + model: { required: false, multiple: true }, + imagev2: { required: true }, + dataset: { required: false, useExceedSize: true }, + networkType: { required: true }, + spec: { required: true }, + }, + }], + 'METAX': [{ + url: 'grampus/notebook/create?type=6', + clusterType: 'C2Net', + tips2: i18n.t('cloudbrainObj.pathTips3', { + code: '/tmp/code', + dataset: '/tmp/dataset', + model: '/tmp/pretrainmodel', + }), + form: { + taskName: { required: true, }, + taskDescr: { required: false, }, + branchName: { required: true, }, + model: { required: false, multiple: true }, + imagev2: { required: true }, + dataset: { required: false, useExceedSize: true }, + networkType: { required: true }, + spec: { required: true }, + }, + }], }] }], // 训练任务 @@ -474,7 +514,7 @@ export const ListPageConfigs = { ], pages: [{ jobType: 'DEBUG', - sortList: getSortList(['', 'GPU', 'NPU', 'GCU', 'MLU', 'DCU']), + sortList: getSortList(['', 'GPU', 'NPU', 'GCU', 'MLU', 'DCU', 'ILUVATAR', 'METAX']), jobTypeName: getListValueWithKey(JOB_TYPE, 'DEBUG'), url: 'debugjob', createUrl: 'grampus/notebook/create?type=1', @@ -707,6 +747,56 @@ export const DetailPageConfigs = { name: 'operationProfile' }], }], + 'ILUVATAR': [{ + detailUrl: 'grampus/notebook/', + summary: [], + operations: [], + tabs: [{ + name: 'configInfo', + fields: [ + 'taskName', 'imagev2', + 'status', 'spec', + 'creator', 'aiCenter', + 'branch', 'modelName', + 'computerRes', 'modelVersion', + 'createTime', 'modelFiles', + 'startTime', '', + 'endTime', '', + 'duration', '', + 'descr', '', + 'failedReason', + 'dataset', + 'modelList', + ] + }, { + name: 'operationProfile' + }], + }], + 'METAX': [{ + detailUrl: 'grampus/notebook/', + summary: [], + operations: [], + tabs: [{ + name: 'configInfo', + fields: [ + 'taskName', 'imagev2', + 'status', 'spec', + 'creator', 'aiCenter', + 'branch', 'modelName', + 'computerRes', 'modelVersion', + 'createTime', 'modelFiles', + 'startTime', '', + 'endTime', '', + 'duration', '', + 'descr', '', + 'failedReason', + 'dataset', + 'modelList', + ] + }, { + name: 'operationProfile' + }], + }], }] }], // 训练任务 -- 2.34.1 From adaf4e637f680bf2aebbf480ba538b4842031810 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Sep 2023 14:39:43 +0800 Subject: [PATCH 4/9] fix bug --- services/socketwrap/clientManager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go index 57e1a8fb9f..f3a4532b42 100755 --- a/services/socketwrap/clientManager.go +++ b/services/socketwrap/clientManager.go @@ -10,7 +10,7 @@ import ( "github.com/elliotchance/orderedmap" ) -var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 39, 40, 41, 42, 43, 44, 45, 46, 47} +var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49} type ClientsManager struct { Clients *orderedmap.OrderedMap -- 2.34.1 From d7042aa347c1ddc97a0dc2b7c239b1348f5b1091 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Sep 2023 15:52:38 +0800 Subject: [PATCH 5/9] fix bug --- models/cloudbrain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index bb7de27052..f78dfc86f6 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -161,8 +161,8 @@ const ( MLU = "MLU" DCU = "DCU" CPU = "CPU" - ILUVATAR = "ILUVATAR" - METAX = "METAX" + ILUVATAR = "ILUVATAR-GPGPU" + METAX = "METAX-GPGPU" ProcessorTypeNPU = "npu.huawei.com/NPU" ProcessorTypeGPU = "nvidia.com/gpu" -- 2.34.1 From a6752b4449cf888f0a5184f6fc8cbd43e7256977 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Sep 2023 16:40:44 +0800 Subject: [PATCH 6/9] fix bug --- models/cloudbrain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index f78dfc86f6..aecc026c58 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -170,8 +170,8 @@ const ( ProcessorTypeMLU = "cambricon.com/mlu" ProcessorTypeDCU = "ac.sugon.com/dcu" ProcessorTypeCPU = "hpc/cpu" - ProcessorTypeILUVATAR = "iluvatar.com/iluvatar" - ProcessorTypeMETAX = "metax-tech.com/metax" + ProcessorTypeILUVATAR = "iluvatar.com/iluvatar-gpgpu" + ProcessorTypeMETAX = "metax-tech.com/metax-gpgpu" ) const CloudbrainTwoDefaultVersion = "/V0001" -- 2.34.1 From d4b4e1ea443a1c03b6b827c687eec4eb992d3bef Mon Sep 17 00:00:00 2001 From: chenshihai Date: Mon, 11 Sep 2023 17:06:21 +0800 Subject: [PATCH 7/9] =?UTF-8?q?add=20ILUVATAR=E3=80=81METAX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 2 ++ public/home/home.js | 10 ++++-- templates/admin/cloudbrain/search.tmpl | 2 ++ .../admin/cloudbrain/search_dashboard.tmpl | 2 ++ templates/user/dashboard/feeds.tmpl | 18 +++++++++- .../components/cloudbrain/FormTop.vue | 3 +- .../components/cloudbrain/SpecSelect.vue | 4 +-- web_src/vuepages/const/index.js | 4 +-- web_src/vuepages/langs/config/en-US.js | 10 ++++++ web_src/vuepages/langs/config/zh-CN.js | 12 ++++++- web_src/vuepages/pages/cloudbrain/configs.js | 33 ++++++++++--------- 12 files changed, 77 insertions(+), 25 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 976e119ab3..a8ddb71d3e 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3187,6 +3187,8 @@ task_c2ent_gcutrainjob=`created GCU type train task %s` task_c2ent_mlutrainjob=`created MLU type train task %s` task_c2net_dcudebugjob=`created DCU type debugging task %s` +task_c2net_gpudebugjob1=`created ILUVATAR-GPGPU type debugging task %s` +task_c2net_gpudebugjob2=`created METAX-GPGPU type debugging task %s` task_c2ent_onlineinferjob=`created GPU type online inference task %s` task_c2net_cpusupercomputejob=`created CPU type HPC task %s` task_nputrainjob=`created NPU training task %s` diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 4b96661aeb..b3947dfbfb 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3205,6 +3205,8 @@ task_c2ent_gcutrainjob=`创建了GCU类型训练任务 %s` task_c2ent_mlutrainjob=`创建了MLU类型训练任务 %s` task_c2net_dcudebugjob=`创建了DCU类型调试任务 %s` +task_c2net_gpudebugjob1=`创建了ILUVATAR-GPGPU类型调试任务 %s` +task_c2net_gpudebugjob2=`创建了METAX-GPGPU类型调试任务 %s` task_c2ent_onlineinferjob=`创建了GPU类型在线推理任务 %s` task_c2net_cpusupercomputejob=`创建了CPU类型超算任务 %s` task_nputrainjob=`创建了NPU类型训练任务 %s` diff --git a/public/home/home.js b/public/home/home.js index 5cbb6a78a5..0cca1a38ea 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -254,7 +254,9 @@ document.onreadystatechange = function () { } } else if(record.OpType == "25" || record.OpType == "29" || record.OpType == "39" || record.OpType == "40" || record.OpType == "41" - || record.OpType == "43"|| record.OpType == "44"|| record.OpType == "45"|| record.OpType == "46"|| record.OpType == "47"){ + || record.OpType == "43"|| record.OpType == "44"|| record.OpType == "45"|| record.OpType == "46"|| record.OpType == "47" + || record.OpType == "48"|| record.OpType == "49" + ){ html += recordPrefix + actionName; const taskLink = getTaskLink(record); if (taskLink) { @@ -326,7 +328,7 @@ function getTaskLink(record){ } else { re = ''; } - }else if(record.OpType == 39 || record.OpType == 40 || record.OpType == 41 || record.OpType == 43|| record.OpType == 46){ + }else if(record.OpType == 39 || record.OpType == 40 || record.OpType == 41 || record.OpType == 43|| record.OpType == 46|| record.OpType == 48|| record.OpType == 49){ if (record.Cloudbrain) { re = re + "/grampus/notebook/" + record.Cloudbrain.ID; } else { @@ -502,6 +504,8 @@ var actionNameZH={ "45":"创建了GPU类型在线推理任务", "46":"创建了DCU类型调试任务", "47":"创建了CPU类型超算任务", + "48":"创建了ILUVATAR-GPGPU类型调试任务", + "49":"创建了METAX-GPGPU类型调试任务", }; var actionNameEN={ @@ -542,6 +546,8 @@ var actionNameEN={ "45":" created GPU type online inference task ", "46":" created DCU type debugging task ", "47":" created CPU type super compute task ", + "48":" created ILUVATAR-GPGPU type debugging task ", + "49":" created METAX-GPGPU type debugging task ", }; var repoAndOrgZH={ diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl index 7fe24aa5d4..c3e8c1904f 100644 --- a/templates/admin/cloudbrain/search.tmpl +++ b/templates/admin/cloudbrain/search.tmpl @@ -52,6 +52,8 @@ MLU DCU CPU + ILUVATAR-GPGPU + METAX-GPGPU
diff --git a/templates/admin/cloudbrain/search_dashboard.tmpl b/templates/admin/cloudbrain/search_dashboard.tmpl index 6713e0fd33..f16b4e37c2 100644 --- a/templates/admin/cloudbrain/search_dashboard.tmpl +++ b/templates/admin/cloudbrain/search_dashboard.tmpl @@ -63,6 +63,8 @@ MLU DCU CPU + ILUVATAR-GPGPU + METAX-GPGPU
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index ad111186ee..017e6963a1 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -157,6 +157,18 @@ {{$.i18n.Tr "action.task_c2net_cpusupercomputejob" .GetRepoLink (Printf "%d" .Cloudbrain.ID) .RefName | Str2html}} {{else}} {{$.i18n.Tr "action.task_c2net_cpusupercomputejob" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} + {{end}} + {{else if eq .GetOpType 48}} + {{if .Cloudbrain}} + {{$.i18n.Tr "action.task_c2net_gpudebugjob1" .GetRepoLink (Printf "%d" .Cloudbrain.ID) .RefName | Str2html}} + {{else}} + {{$.i18n.Tr "action.task_c2net_gpudebugjob1" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} + {{end}} + {{else if eq .GetOpType 49}} + {{if .Cloudbrain}} + {{$.i18n.Tr "action.task_c2net_gpudebugjob2" .GetRepoLink (Printf "%d" .Cloudbrain.ID) .RefName | Str2html}} + {{else}} + {{$.i18n.Tr "action.task_c2net_gpudebugjob2" "" "" "" | Str2html}}{{.RefName}}{{$.i18n.Tr "repo.issues.deleted_milestone"}} {{end}} {{else if eq .GetOpType 44}} {{if .Cloudbrain}} @@ -221,6 +233,10 @@ {{else if eq .GetOpType 47}} + {{else if eq .GetOpType 48}} + + {{else if eq .GetOpType 49}} + {{else if eq .GetOpType 27}} {{else if eq .GetOpType 28}} @@ -234,7 +250,7 @@ {{else if eq .GetOpType 35}} {{else}} - {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} + {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} {{end}}
diff --git a/web_src/vuepages/components/cloudbrain/FormTop.vue b/web_src/vuepages/components/cloudbrain/FormTop.vue index 382d62d8e9..dc6dbdcdeb 100644 --- a/web_src/vuepages/components/cloudbrain/FormTop.vue +++ b/web_src/vuepages/components/cloudbrain/FormTop.vue @@ -94,7 +94,7 @@ export default { .list { display: flex; align-items: center; - + flex-wrap: wrap; .item { display: flex; align-items: center; @@ -106,6 +106,7 @@ export default { height: 38px; padding: 0 12px; border-left: none; + margin-bottom: 5px; i { margin-top: -7px; diff --git a/web_src/vuepages/components/cloudbrain/SpecSelect.vue b/web_src/vuepages/components/cloudbrain/SpecSelect.vue index 28c864e9f1..df99d9655d 100644 --- a/web_src/vuepages/components/cloudbrain/SpecSelect.vue +++ b/web_src/vuepages/components/cloudbrain/SpecSelect.vue @@ -299,8 +299,8 @@ export default { .GCU_icon, .MLU_icon, .DCU_icon, - .ILUVATAR_icon, - .METAX_icon { + .ILUVATAR-GPGPU_icon, + .METAX-GPGPU_icon { color: white; width: 22px; height: 22px; diff --git a/web_src/vuepages/const/index.js b/web_src/vuepages/const/index.js index 0448e343a7..290e3bb44d 100644 --- a/web_src/vuepages/const/index.js +++ b/web_src/vuepages/const/index.js @@ -11,8 +11,8 @@ export const JOB_TYPE = [{ k: 'DEBUG', v: i18n.t('debugTask') }, { k: 'TRAIN', v // 资源管理 export const CLUSTERS = [{ k: 'OpenI', v: i18n.t('resourcesManagement.OpenI') }, { k: 'C2Net', v: i18n.t('resourcesManagement.C2Net') }]; export const AI_CENTER = [{ k: 'OpenIOne', v: i18n.t('resourcesManagement.OpenIOne') }, { k: 'OpenITwo', v: i18n.t('resourcesManagement.OpenITwo') }, { k: 'OpenIChengdu', v: i18n.t('resourcesManagement.OpenIChengdu') }, { k: 'pclcci', v: i18n.t('resourcesManagement.pclcci') }, { k: 'hefei', v: i18n.t('resourcesManagement.hefeiCenter') }, { k: 'xuchang', v: i18n.t('resourcesManagement.xuchangCenter') }]; -export const COMPUTER_RESOURCES = [{ k: 'CPU', v: 'CPU' }, { k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR', v: 'ILUVATAR' }, { k: 'METAX', v: 'METAX' }]; -export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'DCU', v: 'DCU' }]; +export const COMPUTER_RESOURCES = [{ k: 'CPU', v: 'CPU' }, { k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR-GPGPU', v: 'ILUVATAR-GPGPU' }, { k: 'METAX-GPGPU', v: 'METAX-GPGPU' }]; +export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'MLU290', v: 'MLU290' }, { k: 'RTX3080', v: 'RTX3080' }, { k: 'ENFLAME-T20', v: 'ENFLAME-T20' }, { k: 'DCU', v: 'DCU' }, { k: 'BI-V100', v: 'BI-V100' }, { k: 'MR-V100', v: 'MR-V100' }, { k: 'N100', v: 'N100' }]; export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.willOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }]; export const NETWORK_TYPE = [{ k: 1, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.noInternet')})` }, { k: 2, v: `${i18n.t('cloudbrainObj.networkType')}(${i18n.t('cloudbrainObj.hasInternet')})` }]; export const NETWORK_TYPE_VALUE = [{ k: 1, v: i18n.t('cloudbrainObj.noInternet') }, { k: 2, v: i18n.t('cloudbrainObj.hasInternet') }]; diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js index 5dd0eef7ca..11d301e707 100644 --- a/web_src/vuepages/langs/config/en-US.js +++ b/web_src/vuepages/langs/config/en-US.js @@ -104,6 +104,16 @@ const en = { emptyPageDescr: 'The page you are trying to reach either does not exist or you are not authorized to view it.', handleTask: 'Processing tasks', freeCompute: 'Inclusive computing power', + computeResourceTitle: { + 'CPU/GPU': 'NVIDIA GPU', + GPU: 'NVIDIA GPU', + NPU: 'Ascend NPU', + GCU: 'Enflame GCU', + MLU: 'Cambricon MLU', + DCU: 'HYGON DCU', + 'ILUVATAR-GPGPU': 'Iluvatar CoreX GPGPU', + 'METAX-GPGPU': 'MetaX GPGPU', + }, resourcesManagement: { OpenI: 'OpenI', C2Net: 'C2Net', diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js index 9a19642ef1..515724cc7a 100644 --- a/web_src/vuepages/langs/config/zh-CN.js +++ b/web_src/vuepages/langs/config/zh-CN.js @@ -103,6 +103,16 @@ const zh = { emptyPageDescr: '您正尝试访问的页面 不存在 或 您尚未被授权 查看该页面。', handleTask: '处理任务', freeCompute: '普惠算力', + computeResourceTitle: { + 'CPU/GPU': '英伟达GPU', + GPU: '英伟达GPU', + NPU: '昇腾NPU', + GCU: '燧原GCU', + MLU: '寒武纪MLU', + DCU: '海光DCU', + 'ILUVATAR-GPGPU': '天数智芯GPGPU', + 'METAX-GPGPU': '沐曦GPGPU', + }, resourcesManagement: { OpenI: "启智集群", C2Net: "智算集群", @@ -370,7 +380,7 @@ const zh = { forkModelSuccess: '模型内容复制完成，fork成功！', debugModel: '调试模型', onlineInference: '在线体验', - deleted:'已删除', + deleted: '已删除', }, repos: { activeOrganization: '活跃组织', diff --git a/web_src/vuepages/pages/cloudbrain/configs.js b/web_src/vuepages/pages/cloudbrain/configs.js index cf800f800b..5d80e13994 100644 --- a/web_src/vuepages/pages/cloudbrain/configs.js +++ b/web_src/vuepages/pages/cloudbrain/configs.js @@ -3,7 +3,8 @@ import { JOB_TYPE } from '~/const'; import { getListValueWithKey } from '~/utils'; const CLUSTERS = [{ k: 'OpenI', v: i18n.t('cloudbrainObj.openi') }, { k: 'C2Net', v: i18n.t('cloudbrainObj.c2net') }]; -const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'CPU/GPU' }, { k: 'NPU', v: 'Ascend NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR', v: 'ILUVATAR' }, { k: 'METAX', v: 'METAX' }]; +const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'CPU/GPU' }, { k: 'NPU', v: 'Ascend NPU' }, { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, { k: 'ILUVATAR-GPGPU', v: 'ILUVATAR-GPGPU' }, { k: 'METAX-GPGPU', v: 'METAX-GPGPU' }]; +const COMPUTER_RESOURCES_TITLE = [{ k: 'GPU', v: i18n.t('computeResourceTitle.GPU') }, { k: 'NPU', v: i18n.t('computeResourceTitle.NPU') }, { k: 'GCU', v: i18n.t('computeResourceTitle.GCU') }, { k: 'MLU', v: i18n.t('computeResourceTitle.MLU') }, { k: 'DCU', v: i18n.t('computeResourceTitle.DCU') }, { k: 'ILUVATAR-GPGPU', v: i18n.t('computeResourceTitle.ILUVATAR-GPGPU') }, { k: 'METAX-GPGPU', v: i18n.t('computeResourceTitle.METAX-GPGPU') }]; const sortList = [ { k: '', v: i18n.t('all') }, @@ -12,8 +13,8 @@ const sortList = [ { k: 'GCU', v: 'GCU' }, { k: 'MLU', v: 'MLU' }, { k: 'DCU', v: 'DCU' }, - { k: 'ILUVATAR', v: 'ILUVATAR' }, - { k: 'METAX', v: 'METAX' }, + { k: 'ILUVATAR-GPGPU', v: 'ILUVATAR-GPGPU' }, + { k: 'METAX-GPGPU', v: 'METAX-GPGPU' }, ]; const getSortList = (typeList) => { @@ -82,7 +83,7 @@ export const CreatePageConfigs = { }], 'C2Net': [{ url: 'grampus/notebook/create?type=0', - computerResouces: ['GPU', 'NPU', 'GCU', 'MLU', 'DCU', 'ILUVATAR', 'METAX'], + computerResouces: ['GPU', 'NPU', 'GCU', 'MLU', 'DCU', 'ILUVATAR-GPGPU', 'METAX-GPGPU'], 'GPU': [{ url: 'grampus/notebook/create?type=0', clusterType: 'C2Net', @@ -175,13 +176,13 @@ export const CreatePageConfigs = { spec: { required: true }, }, }], - 'ILUVATAR': [{ + 'ILUVATAR-GPGPU': [{ url: 'grampus/notebook/create?type=5', clusterType: 'C2Net', tips2: i18n.t('cloudbrainObj.pathTips3', { - code: '/tmp/code', - dataset: '/tmp/dataset', - model: '/tmp/pretrainmodel', + code: '/code', + dataset: '/dataset', + model: '/pretrainmodel', }), form: { taskName: { required: true, }, @@ -194,13 +195,13 @@ export const CreatePageConfigs = { spec: { required: true }, }, }], - 'METAX': [{ + 'METAX-GPGPU': [{ url: 'grampus/notebook/create?type=6', clusterType: 'C2Net', tips2: i18n.t('cloudbrainObj.pathTips3', { - code: '/tmp/code', - dataset: '/tmp/dataset', - model: '/tmp/pretrainmodel', + code: '/code', + dataset: '/dataset', + model: '/pretrainmodel', }), form: { taskName: { required: true, }, @@ -514,7 +515,7 @@ export const ListPageConfigs = { ], pages: [{ jobType: 'DEBUG', - sortList: getSortList(['', 'GPU', 'NPU', 'GCU', 'MLU', 'DCU', 'ILUVATAR', 'METAX']), + sortList: getSortList(['', 'GPU', 'NPU', 'GCU', 'MLU', 'DCU', 'ILUVATAR-GPGPU', 'METAX-GPGPU']), jobTypeName: getListValueWithKey(JOB_TYPE, 'DEBUG'), url: 'debugjob', createUrl: 'grampus/notebook/create?type=1', @@ -747,7 +748,7 @@ export const DetailPageConfigs = { name: 'operationProfile' }], }], - 'ILUVATAR': [{ + 'ILUVATAR-GPGPU': [{ detailUrl: 'grampus/notebook/', summary: [], operations: [], @@ -772,7 +773,7 @@ export const DetailPageConfigs = { name: 'operationProfile' }], }], - 'METAX': [{ + 'METAX-GPGPU': [{ detailUrl: 'grampus/notebook/', summary: [], operations: [], @@ -1170,7 +1171,7 @@ export const getCreatePageConfigs = (url) => { computerResouces: computerResouces.map(_item => { return { key: _item, - label: getListValueWithKey(COMPUTER_RESOURCES, _item), + label: getListValueWithKey(COMPUTER_RESOURCES_TITLE, _item), url: cfg2[_item] && cfg2[_item][0] ? cfg2[_item][0].url : '', } }), -- 2.34.1 From 663a72a62c680ece5bb8468a6a524e240657215f Mon Sep 17 00:00:00 2001 From: chenshihai Date: Thu, 14 Sep 2023 16:44:57 +0800 Subject: [PATCH 8/9] update style --- web_src/vuepages/components/cloudbrain/FormTop.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/vuepages/components/cloudbrain/FormTop.vue b/web_src/vuepages/components/cloudbrain/FormTop.vue index dc6dbdcdeb..18e7b0fd87 100644 --- a/web_src/vuepages/components/cloudbrain/FormTop.vue +++ b/web_src/vuepages/components/cloudbrain/FormTop.vue @@ -24,7 +24,7 @@
-
{{ $t('cloudbrainObj.computeResource') }}
+
{{ $t('cloudbrainObj.computeResource') }}
Date: Fri, 15 Sep 2023 16:31:36 +0800 Subject: [PATCH 9/9] update list show --- templates/admin/cloudbrain/list.tmpl | 4 ++-- templates/user/dashboard/cloudbrains.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 2a6087ca50..ec858379ac 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -181,7 +181,7 @@
{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}} + style="font-size: 12px;" title="{{.ComputeResource}}">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
@@ -432,7 +432,7 @@
{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}} + style="font-size: 12px;" title="{{.ComputeResource}}">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index d66a429463..a48a50be52 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -166,7 +166,7 @@
{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}} + style="font-size: 12px;" title="{{.ComputeResource}}">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
@@ -402,7 +402,7 @@
{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}} + style="font-size: 12px;" title="{{.ComputeResource}}">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
-- 2.34.1