feat(ai): streamline GPU groups and NUMA configuration (#14381)

This commit is contained in:
ssongliu
2026-11-10 15:27:38 +08:00
committed by GitHub
parent ddce8287ec
commit aec5684184
18 changed files with 561 additions and 485 deletions
+3 -1
View File
@@ -20,9 +20,11 @@ import (
func LoadModelGPUDevices() dto.ModelGPUDevices {
result := dto.ModelGPUDevices{Devices: []dto.ModelGPUDevice{}, Warnings: []string{}}
nodes, topologyErr := loadModelNUMANodes("/sys")
result.NUMANodes = nodes
if topologyErr != nil {
result.NUMANodes = []dto.ModelNUMANode{}
result.Warnings = append(result.Warnings, topologyErr.Error())
} else {
result.NUMANodes = nodes
}
ok, client := accelerator.New()
if !ok {
+6 -7
View File
@@ -777,12 +777,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate:
'No available GPUs were detected under NUMA {node}. A group cannot be created from this node.',
inspectNUMA:
'Run these read-only commands in the current node’s terminal and match PCI addresses to check GPU NUMA placement:',
numaQueryHint:
'numa_node contains the NUMA node ID; -1 means the system has not reported a placement. If the results differ from this page, refresh and try again.',
singleGPU:
'GPU groups are intended for multi-GPU machines. This node has only one GPU and does not need grouping.',
relationTopology: 'Relationship topology',
relationHelp: 'Select a GPU or group to highlight its memberships.',
selectionHelp:
@@ -809,6 +805,8 @@ const message = {
ungrouped: 'Ungrouped',
unknownNode: 'Unknown NUMA affinity',
unknownNodeHelp:
'The system has not reported the NUMA affinity of these GPUs. GPU selection and grouping are still available.',
memoryNode: 'Memory node',
selectNode: 'Select GPUs in this node',
noDevices: 'No GPUs in this node',
@@ -819,7 +817,7 @@ const message = {
overview: 'Device overview',
groups: 'GPU groups',
history: 'Monitoring history',
source: 'Configuration',
source: 'GPU source',
custom: 'Custom',
selectRequired: 'Select a GPU group',
snapshotHelp:
@@ -1147,6 +1145,7 @@ const message = {
numaCross: 'Selected GPUs span multiple NUMA nodes. Select nodes manually.',
numaCount: 'Automatic binding requires specific GPUs or all GPUs.',
numaRequired: 'Select at least one NUMA node.',
numaTopologyUnavailable: 'NUMA topology is unavailable.',
numaUnavailable: 'NUMA node is unavailable or has no CPUs or memory.',
gpuAcceleration: 'GPU acceleration',
gpuMode: 'Accelerator selection',
+6 -7
View File
@@ -780,12 +780,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate:
'No se detectaron GPU disponibles en NUMA {node}. No se puede crear un grupo desde este nodo.',
inspectNUMA:
'Ejecute estos comandos de solo lectura en el terminal del nodo actual y compare las direcciones PCI para comprobar la ubicación NUMA de las GPU:',
numaQueryHint:
'numa_node indica el ID del nodo NUMA; -1 significa que el sistema no ha informado de la ubicación. Si los resultados difieren de esta página, actualice e inténtelo de nuevo.',
singleGPU:
'Los grupos de GPU están destinados a equipos con varias GPU. Este nodo solo tiene una GPU y no necesita agrupación.',
relationTopology: 'Topología de relaciones',
relationHelp: 'Seleccione una GPU o un grupo para resaltar sus relaciones de pertenencia.',
selectionHelp:
@@ -812,6 +808,8 @@ const message = {
ungrouped: 'Sin grupo',
unknownNode: 'Nodo NUMA desconocido',
unknownNodeHelp:
'El sistema no ha informado de la afinidad NUMA de estas GPU. La selección y agrupación de GPU siguen disponibles.',
memoryNode: 'Nodo de memoria',
selectNode: 'Seleccionar las GPU de este nodo',
noDevices: 'No hay GPU en este nodo',
@@ -822,7 +820,7 @@ const message = {
overview: 'Resumen de dispositivos',
groups: 'Grupos de GPU',
history: 'Historial de supervisión',
source: 'Configuración',
source: 'Origen de GPU',
custom: 'Personalizada',
selectRequired: 'Seleccione un grupo de GPU',
snapshotHelp:
@@ -1149,6 +1147,7 @@ const message = {
numaCross: 'Las GPU seleccionadas abarcan varios nodos NUMA. Selecciónelos manualmente.',
numaCount: 'La afinidad automática requiere GPU específicas o todas las GPU.',
numaRequired: 'Seleccione al menos un nodo NUMA.',
numaTopologyUnavailable: 'La topología NUMA no está disponible.',
numaUnavailable: 'El nodo NUMA no está disponible o carece de CPU o memoria.',
gpuAcceleration: 'Aceleración GPU',
gpuMode: 'Selección de aceleradores',
+6 -6
View File
@@ -772,11 +772,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate: 'در NUMA {node} هیچ GPU قابل استفاده‌ای شناسایی نشد. ایجاد گروه از این گره ممکن نیست.',
inspectNUMA:
'این فرمان‌های فقط‌خواندنی را در پایانه گره فعلی اجرا کنید و با تطبیق آدرس‌های PCI، وابستگی GPU به NUMA را بررسی کنید:',
numaQueryHint:
'مقدار numa_node شناسه گره NUMA است؛ -1 یعنی سیستم وابستگی را گزارش نکرده است. اگر نتایج با صفحه متفاوت است، صفحه را تازه‌سازی کرده و دوباره تلاش کنید.',
singleGPU:
'گروه\u200cبندی GPU برای دستگاه\u200cهای دارای چند GPU است. این گره تنها یک GPU دارد و نیازی به گروه\u200cبندی ندارد.',
relationTopology: 'توپولوژی روابط',
relationHelp: 'برای برجسته کردن روابط عضویت، یک GPU یا گروه را انتخاب کنید.',
selectionHelp:
@@ -803,6 +800,8 @@ const message = {
ungrouped: 'بدون گروه',
unknownNode: 'گره NUMA نامشخص',
unknownNodeHelp:
'سیستم وابستگی NUMA این GPUها را گزارش نکرده است. انتخاب و گروه\u200cبندی GPUها همچنان امکان\u200cپذیر است.',
memoryNode: 'گره حافظه',
selectNode: 'انتخاب GPUهای این گره',
noDevices: 'این گره GPU ندارد',
@@ -813,7 +812,7 @@ const message = {
overview: 'نمای کلی دستگاه‌ها',
groups: 'گروه‌های GPU',
history: 'تاریخچه پایش',
source: 'پیکربندی',
source: 'منبع GPU',
custom: 'سفارشی',
selectRequired: 'یک گروه GPU انتخاب کنید',
snapshotHelp:
@@ -1131,6 +1130,7 @@ const message = {
numaCross: 'پردازنده‌های گرافیکی انتخاب‌شده در چند گره NUMA قرار دارند. دستی انتخاب کنید.',
numaCount: 'اتصال خودکار به انتخاب پردازنده‌های گرافیکی مشخص یا همه آن‌ها نیاز دارد.',
numaRequired: 'حداقل یک گره NUMA انتخاب کنید.',
numaTopologyUnavailable: 'اطلاعات توپولوژی NUMA در دسترس نیست.',
numaUnavailable: 'گره NUMA در دسترس نیست یا پردازنده یا حافظه ندارد.',
gpuAcceleration: 'شتاب‌دهی GPU',
gpuMode: 'انتخاب شتاب‌دهنده',
+6 -7
View File
@@ -776,12 +776,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate:
'NUMA {node} に利用可能な GPU が検出されなかったため、このノードからグループを作成できません。',
inspectNUMA:
'現在のノードの端末で次の読み取り専用コマンドを実行し、PCI アドレスを照合して GPU の NUMA 所属を確認してください:',
numaQueryHint:
'numa_node は NUMA ノード番号を示します。-1 はシステムが所属を報告していないことを意味します。結果が画面と異なる場合は、更新して再試行してください。',
singleGPU:
'GPU グループは複数の GPU を搭載したマシン向けです。このノードには GPU が 1 基しかないため、グループ化は不要です。',
relationTopology: '関係トポロジー',
relationHelp: 'GPU またはグループを選択すると、所属関係が強調表示されます。',
selectionHelp:
@@ -808,6 +804,8 @@ const message = {
ungrouped: '未分類',
unknownNode: 'NUMA 所属不明',
unknownNodeHelp:
'これらの GPU の NUMA 所属はシステムから報告されていません。GPU の選択とグループ化には影響しません。',
memoryNode: 'メモリノード',
selectNode: 'このノードの GPU を選択',
noDevices: 'このノードに GPU はありません',
@@ -818,7 +816,7 @@ const message = {
overview: 'デバイス概要',
groups: 'GPU グループ',
history: '監視履歴',
source: '設定方法',
source: 'GPU の選択元',
custom: 'カスタム',
selectRequired: 'GPU グループを選択してください',
snapshotHelp: 'デプロイには現在の設定が保存されます。グループの変更は既存のデプロイに自動適用されません。',
@@ -1134,6 +1132,7 @@ const message = {
numaCross: '選択した GPU は複数の NUMA ノードに属しています。手動で選択してください。',
numaCount: '自動バインドには特定の GPU またはすべての GPU を選択してください。',
numaRequired: 'NUMA ノードを少なくとも 1 つ選択してください。',
numaTopologyUnavailable: 'NUMA トポロジー情報を取得できません。',
numaUnavailable: 'NUMA ノードが利用できないか、CPU またはメモリがありません。',
gpuAcceleration: 'GPU アクセラレーション',
gpuMode: 'アクセラレーターの選択',
+6 -7
View File
@@ -767,12 +767,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate:
'NUMA {node}에서 사용 가능한 GPU를 찾지 못했습니다. 이 노드에서 그룹을 생성할 수 없습니다.',
inspectNUMA:
'현재 노드의 터미널에서 다음 읽기 전용 명령을 실행하고 PCI 주소를 대조하여 GPU의 NUMA 소속을 확인하세요:',
numaQueryHint:
'numa_node 값은 NUMA 노드 번호입니다. -1은 시스템이 소속 정보를 보고하지 않았음을 나타냅니다. 결과가 페이지와 다르면 새로 고침 후 다시 시도하세요.',
singleGPU:
'GPU 그룹은 여러 GPU가 있는 시스템용입니다. 현재 노드에는 GPU가 하나뿐이므로 그룹화가 필요하지 않습니다.',
relationTopology: '관계 토폴로지',
relationHelp: 'GPU 또는 그룹을 선택하면 소속 관계가 강조 표시됩니다.',
selectionHelp:
@@ -799,6 +795,8 @@ const message = {
ungrouped: '미분류',
unknownNode: 'NUMA 소속 알 수 없음',
unknownNodeHelp:
'시스템에서 이 GPU들의 NUMA 소속을 보고하지 않았습니다. GPU 선택 및 그룹화에는 영향을 주지 않습니다.',
memoryNode: '메모리 노드',
selectNode: '이 노드의 GPU 선택',
noDevices: '이 노드에 GPU가 없습니다',
@@ -809,7 +807,7 @@ const message = {
overview: '장치 개요',
groups: 'GPU 그룹',
history: '모니터링 기록',
source: '설정 방식',
source: 'GPU 소스',
custom: '사용자 지정',
selectRequired: 'GPU 그룹을 선택하세요',
snapshotHelp: '배포는 현재 설정을 저장합니다. 그룹 변경은 기존 배포에 자동 적용되지 않습니다.',
@@ -1122,6 +1120,7 @@ const message = {
numaCross: '선택한 GPU가 여러 NUMA 노드에 걸쳐 있습니다. 수동으로 선택하세요.',
numaCount: '자동 바인딩에는 특정 GPU 또는 모든 GPU를 선택해야 합니다.',
numaRequired: 'NUMA 노드를 하나 이상 선택하세요.',
numaTopologyUnavailable: 'NUMA 토폴로지 정보를 사용할 수 없습니다.',
numaUnavailable: 'NUMA 노드를 사용할 수 없거나 CPU 또는 메모리가 없습니다.',
gpuAcceleration: 'GPU 가속',
gpuMode: '가속기 선택',
+6 -6
View File
@@ -766,11 +766,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate: 'ບໍ່ພົບ GPU ທີ່ໃຊ້ໄດ້ໃນ NUMA {node}. ບໍ່ສາມາດສ້າງກຸ່ມຈາກໂນດນີ້ໄດ້.',
inspectNUMA:
'ໃຫ້ເອີ້ນໃຊ້ຄຳສັ່ງອ່ານຢ່າງດຽວນີ້ໃນເທີມິນອລຂອງໂນດປັດຈຸບັນ ແລະ ທຽບທີ່ຢູ່ PCI ເພື່ອກວດສອບ NUMA ຂອງ GPU:',
numaQueryHint:
'ຄ່າ numa_node ແມ່ນໝາຍເລກໂນດ NUMA; -1 ໝາຍເຖິງລະບົບບໍ່ໄດ້ລາຍງານການສັງກັດ. ຖ້າຜົນບໍ່ກົງກັບໜ້ານີ້ ໃຫ້ໂຫຼດໃໝ່ແລ້ວລອງອີກຄັ້ງ.',
singleGPU:
'ການຈັດກຸ່ມ GPU ໃຊ້ສຳລັບເຄື່ອງທີ່ມີ GPU ຫຼາຍຕົວ. ໂນດນີ້ມີ GPU ພຽງໜຶ່ງຕົວ ຈຶ່ງບໍ່ຈຳເປັນຕ້ອງຈັດກຸ່ມ.',
relationTopology: 'ໂຄງສ້າງຄວາມສຳພັນ',
relationHelp: 'ເລືອກ GPU ຫຼື ກຸ່ມເພື່ອເນັ້ນຄວາມສຳພັນຂອງສະມາຊິກ.',
selectionHelp:
@@ -797,6 +794,8 @@ const message = {
ungrouped: 'ຍັງບໍ່ມີກຸ່ມ',
unknownNode: 'ບໍ່ຮູ້ໂນດ NUMA',
unknownNodeHelp:
'ລະບົບບໍ່ໄດ້ລາຍງານວ່າ GPU ເຫຼົ່ານີ້ຂຶ້ນກັບໂນດ NUMA ໃດ. ທ່ານຍັງສາມາດເລືອກ ແລະ ຈັດກຸ່ມ GPU ໄດ້.',
memoryNode: 'ໂນດໜ່ວຍຄວາມຈຳ',
selectNode: 'ເລືອກ GPU ໃນໂນດນີ້',
noDevices: 'ບໍ່ມີ GPU ໃນໂນດນີ້',
@@ -807,7 +806,7 @@ const message = {
overview: 'ພາບລວມອຸປະກອນ',
groups: 'ກຸ່ມ GPU',
history: 'ປະຫວັດການຕິດຕາມ',
source: 'ການຕັ້ງຄ່າ',
source: 'ແຫຼ່ງ GPU',
custom: 'ກຳນົດເອງ',
selectRequired: 'ເລືອກກຸ່ມ GPU',
snapshotHelp: 'ການຕິດຕັ້ງບັນທຶກຄ່າປັດຈຸບັນ. ການປ່ຽນກຸ່ມຈະບໍ່ປ່ຽນການຕິດຕັ້ງເກົ່າອັດຕະໂນມັດ.',
@@ -1116,6 +1115,7 @@ const message = {
numaCross: 'GPU ທີ່ເລືອກຢູ່ຫຼາຍໂນດ NUMA. ກະລຸນາເລືອກເອງ.',
numaCount: 'ການຜູກອັດຕະໂນມັດຕ້ອງເລືອກ GPU ສະເພາະ ຫຼື GPU ທັງໝົດ.',
numaRequired: 'ກະລຸນາເລືອກຢ່າງໜ້ອຍໜຶ່ງໂນດ NUMA.',
numaTopologyUnavailable: 'ບໍ່ມີຂໍ້ມູນໂຄງສ້າງ NUMA.',
numaUnavailable: 'ໂນດ NUMA ບໍ່ພ້ອມໃຊ້ ຫຼື ບໍ່ມີ CPU ຫຼື ໜ່ວຍຄວາມຈຳ.',
gpuAcceleration: 'ການເລັ່ງ GPU',
gpuMode: 'ເລືອກຕົວເລັ່ງ',
+6 -7
View File
@@ -785,12 +785,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate:
'Tiada GPU tersedia dikesan pada NUMA {node}. Kumpulan tidak boleh dicipta daripada nod ini.',
inspectNUMA:
'Jalankan arahan baca sahaja ini dalam terminal nod semasa dan padankan alamat PCI untuk menyemak penempatan NUMA GPU:',
numaQueryHint:
'numa_node mengandungi ID nod NUMA; -1 bermaksud sistem belum melaporkan penempatan. Jika keputusan berbeza daripada halaman ini, muat semula dan cuba lagi.',
singleGPU:
'Kumpulan GPU adalah untuk mesin dengan berbilang GPU. Nod ini hanya mempunyai satu GPU dan tidak memerlukan pengumpulan.',
relationTopology: 'Topologi hubungan',
relationHelp: 'Pilih GPU atau kumpulan untuk menyerlahkan hubungan keahliannya.',
selectionHelp:
@@ -817,6 +813,8 @@ const message = {
ungrouped: 'Tanpa kumpulan',
unknownNode: 'Nod NUMA tidak diketahui',
unknownNodeHelp:
'Sistem tidak melaporkan perkaitan NUMA bagi GPU ini. Pemilihan dan pengumpulan GPU masih tersedia.',
memoryNode: 'Nod memori',
selectNode: 'Pilih GPU dalam nod ini',
noDevices: 'Tiada GPU dalam nod ini',
@@ -827,7 +825,7 @@ const message = {
overview: 'Gambaran peranti',
groups: 'Kumpulan GPU',
history: 'Sejarah pemantauan',
source: 'Konfigurasi',
source: 'Sumber GPU',
custom: 'Tersuai',
selectRequired: 'Pilih kumpulan GPU',
snapshotHelp:
@@ -1158,6 +1156,7 @@ const message = {
numaCross: 'GPU yang dipilih merentasi beberapa nod NUMA. Pilih secara manual.',
numaCount: 'Pengikatan automatik memerlukan GPU tertentu atau semua GPU.',
numaRequired: 'Pilih sekurang-kurangnya satu nod NUMA.',
numaTopologyUnavailable: 'Maklumat topologi NUMA tidak tersedia.',
numaUnavailable: 'Nod NUMA tidak tersedia atau tiada CPU atau memori.',
gpuAcceleration: 'Pecutan GPU',
gpuMode: 'Pemilihan pemecut',
+6 -7
View File
@@ -778,12 +778,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate:
'Nenhuma GPU disponível foi detectada no NUMA {node}. Não é possível criar um grupo a partir deste nó.',
inspectNUMA:
'Execute estes comandos somente de leitura no terminal do nó atual e compare os endereços PCI para verificar a localização NUMA das GPUs:',
numaQueryHint:
'numa_node contém o ID do nó NUMA; -1 indica que o sistema não informou a localização. Se os resultados diferirem desta página, atualize e tente novamente.',
singleGPU:
'Os grupos de GPU são destinados a máquinas com várias GPUs. Este nó tem apenas uma GPU e não precisa de agrupamento.',
relationTopology: 'Topologia de relações',
relationHelp: 'Selecione uma GPU ou um grupo para destacar suas relações de associação.',
selectionHelp:
@@ -810,6 +806,8 @@ const message = {
ungrouped: 'Sem grupo',
unknownNode: 'Nó NUMA desconhecido',
unknownNodeHelp:
'O sistema não informou a afinidade NUMA destas GPUs. A seleção e o agrupamento de GPUs continuam disponíveis.',
memoryNode: 'Nó de memória',
selectNode: 'Selecionar GPUs deste nó',
noDevices: 'Nenhuma GPU neste nó',
@@ -820,7 +818,7 @@ const message = {
overview: 'Visão geral dos dispositivos',
groups: 'Grupos de GPU',
history: 'Histórico de monitoramento',
source: 'Configuração',
source: 'Origem da GPU',
custom: 'Personalizada',
selectRequired: 'Selecione um grupo de GPU',
snapshotHelp:
@@ -1153,6 +1151,7 @@ const message = {
numaCross: 'As GPUs selecionadas abrangem vários nós NUMA. Selecione-os manualmente.',
numaCount: 'A afinidade automática exige GPUs específicas ou todas as GPUs.',
numaRequired: 'Selecione pelo menos um nó NUMA.',
numaTopologyUnavailable: 'A topologia NUMA está indisponível.',
numaUnavailable: 'O nó NUMA está indisponível ou não possui CPU ou memória.',
gpuAcceleration: 'Aceleração de GPU',
gpuMode: 'Seleção de aceleradores',
+6 -6
View File
@@ -775,11 +775,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate: 'В NUMA {node} не обнаружены доступные GPU. Создать группу из этого узла невозможно.',
inspectNUMA:
'Выполните эти команды только для чтения в терминале текущего узла и сопоставьте адреса PCI, чтобы проверить принадлежность GPU к NUMA:',
numaQueryHint:
'numa_node содержит номер узла NUMA; -1 означает, что система не сообщила принадлежность. Если результаты отличаются от страницы, обновите её и повторите попытку.',
singleGPU:
'Группы GPU предназначены для машин с несколькими GPU. На этом узле только один GPU, поэтому группировка не требуется.',
relationTopology: 'Топология связей',
relationHelp: 'Выберите GPU или группу, чтобы выделить связи участия.',
selectionHelp:
@@ -806,6 +803,8 @@ const message = {
ungrouped: 'Без группы',
unknownNode: 'Узел NUMA неизвестен',
unknownNodeHelp:
'Система не сообщила о привязке этих GPU к узлам NUMA. Выбор и группировка GPU по-прежнему доступны.',
memoryNode: 'Узел памяти',
selectNode: 'Выбрать GPU этого узла',
noDevices: 'В этом узле нет GPU',
@@ -816,7 +815,7 @@ const message = {
overview: 'Обзор устройств',
groups: 'Группы GPU',
history: 'История мониторинга',
source: 'Настройка',
source: 'Источник GPU',
custom: 'Вручную',
selectRequired: 'Выберите группу GPU',
snapshotHelp:
@@ -1145,6 +1144,7 @@ const message = {
numaCross: 'Выбранные GPU относятся к разным узлам NUMA. Выберите узлы вручную.',
numaCount: 'Для автоматической привязки выберите конкретные GPU или все GPU.',
numaRequired: 'Выберите хотя бы один узел NUMA.',
numaTopologyUnavailable: 'Информация о топологии NUMA недоступна.',
numaUnavailable: 'Узел NUMA недоступен либо не имеет процессоров или памяти.',
gpuAcceleration: 'Ускорение GPU',
gpuMode: 'Выбор ускорителей',
+6 -6
View File
@@ -781,11 +781,8 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate: 'NUMA {node} altında kullanılabilir GPU algılanmadı. Bu düğümden grup oluşturulamaz.',
inspectNUMA:
'GPU NUMA yerleşimini kontrol etmek için mevcut düğümün terminalinde bu salt okunur komutları çalıştırın ve PCI adreslerini eşleştirin:',
numaQueryHint:
'numa_node, NUMA düğüm kimliğini içerir; -1, sistemin yerleşimi bildirmediği anlamına gelir. Sonuçlar bu sayfadan farklıysa yenileyip tekrar deneyin.',
singleGPU:
'GPU grupları birden fazla GPU bulunan makineler içindir. Bu düğümde yalnızca bir GPU olduğundan gruplama gerekmez.',
relationTopology: 'İlişki topolojisi',
relationHelp: 'Üyelik ilişkilerini vurgulamak için bir GPU veya grup seçin.',
selectionHelp:
@@ -812,6 +809,8 @@ const message = {
ungrouped: 'Gruplanmamış',
unknownNode: 'NUMA düğümü bilinmiyor',
unknownNodeHelp:
'Sistem bu GPU’ların NUMA ilişkisini bildirmedi. GPU seçimi ve gruplama kullanılmaya devam edilebilir.',
memoryNode: 'Bellek düğümü',
selectNode: 'Bu düğümün GPU birimlerini seç',
noDevices: 'Bu düğümde GPU yok',
@@ -822,7 +821,7 @@ const message = {
overview: 'Cihaz özeti',
groups: 'GPU grupları',
history: 'İzleme geçmişi',
source: 'Yapılandırma',
source: 'GPU kaynağı',
custom: 'Özel',
selectRequired: 'Bir GPU grubu seçin',
snapshotHelp:
@@ -1154,6 +1153,7 @@ const message = {
numaCross: 'Seçilen GPU aygıtları birden fazla NUMA düğümüne yayılıyor. Elle seçin.',
numaCount: 'Otomatik bağlama için belirli GPU aygıtlarını veya tümünü seçin.',
numaRequired: 'En az bir NUMA düğümü seçin.',
numaTopologyUnavailable: 'NUMA topolojisi bilgisi kullanılamıyor.',
numaUnavailable: 'NUMA düğümü kullanılamıyor veya CPU ya da belleği yok.',
gpuAcceleration: 'GPU hızlandırma',
gpuMode: 'Hızlandırıcı seçimi',
+4 -5
View File
@@ -743,10 +743,7 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate: 'NUMA {node} 下未偵測到可用的 GPU,無法從此節點建立分組。',
inspectNUMA: '請在目前節點的終端執行以下唯讀命令,按 PCI 位址對照 GPU 與 NUMA 歸屬:',
numaQueryHint:
'numa_node 的值是 NUMA 節點編號;-1 表示系統未回報歸屬。若偵測結果與頁面不一致,請重新整理後再試。',
singleGPU: 'GPU 分組僅適用於多卡機器,目前節點只有一張 GPU,無需分組。',
relationTopology: '關係拓撲',
relationHelp: '點擊 GPU 或分組,醒目顯示成員關係。',
selectionHelp: '選擇相同裝置類型的 GPU,點擊下一步設定分組;虛線表示待儲存的成員關係。',
@@ -770,6 +767,7 @@ const message = {
ungrouped: '未分組',
unknownNode: 'NUMA 未知',
unknownNodeHelp: '系統未回報這些 GPU 的 NUMA 歸屬,不影響選卡和分組。',
memoryNode: '記憶體節點',
selectNode: '選擇此節點 GPU',
noDevices: '此節點下沒有 GPU',
@@ -780,7 +778,7 @@ const message = {
overview: '裝置概覽',
groups: 'GPU 分組',
history: '歷史監控',
source: '設定方式',
source: 'GPU 來源',
custom: '自訂',
selectRequired: '請選擇 GPU 分組',
snapshotHelp: '部署儲存目前設定,分組變更不會自動影響既有部署。',
@@ -1074,6 +1072,7 @@ const message = {
numaCross: '所選 GPU 跨多個 NUMA 節點,請手動選擇。',
numaCount: '自動匹配需要選擇特定 GPU 或全部 GPU。',
numaRequired: '請至少選擇一個 NUMA 節點。',
numaTopologyUnavailable: 'NUMA 拓撲資訊無法取得。',
numaUnavailable: 'NUMA 節點不可用或缺少 CPU、記憶體。',
gpuAcceleration: 'GPU 加速',
gpuMode: '加速卡選擇',
+4 -5
View File
@@ -760,10 +760,7 @@ const message = {
},
aiTools: {
gpuGroup: {
emptyNodeCreate: 'NUMA {node} 下未检测到可用的 GPU,无法从此节点创建分组。',
inspectNUMA: '请在当前节点的终端执行以下只读命令,按 PCI 地址对照 GPU 与 NUMA 归属:',
numaQueryHint:
'numa_node 的值是 NUMA 节点编号;-1 表示系统未报告归属。若检测结果与页面不一致,请刷新后重试。',
singleGPU: 'GPU 分组仅适用于多卡机器,当前节点只有一张 GPU,无需分组。',
relationTopology: '关系拓扑',
relationHelp: '点击 GPU 或分组,高亮成员关系。',
selectionHelp: '选择同一设备类型的 GPU,点击下一步配置分组;虚线表示待保存的成员关系。',
@@ -787,6 +784,7 @@ const message = {
ungrouped: '未分组',
unknownNode: 'NUMA 未知',
unknownNodeHelp: '系统未报告这些 GPU 的 NUMA 归属,不影响选卡和分组。',
memoryNode: '内存节点',
selectNode: '选择本节点 GPU',
noDevices: '此节点下没有 GPU',
@@ -797,7 +795,7 @@ const message = {
overview: '设备概览',
groups: 'GPU 分组',
history: '历史监控',
source: '配置方式',
source: 'GPU 来源',
custom: '自定义',
selectRequired: '请选择 GPU 分组',
snapshotHelp: '部署保存当前配置,分组变更不会自动影响已有部署。',
@@ -1087,6 +1085,7 @@ const message = {
numaCross: '所选 GPU 跨多个 NUMA 节点,请手动选择。',
numaCount: '自动匹配需要选择具体 GPU 或全部 GPU。',
numaRequired: '请至少选择一个 NUMA 节点。',
numaTopologyUnavailable: 'NUMA 拓扑信息不可用。',
numaUnavailable: 'NUMA 节点不可用或缺少 CPU、内存。',
gpuAcceleration: 'GPU 加速',
gpuMode: '加速卡选择',
@@ -22,43 +22,70 @@
</el-text>
</summary>
<div v-if="model.enabled || model.error" v-show="!loading" class="form-section-body">
<template v-if="!groupEditor && model.enabled">
<el-form-item :label="$t('aiTools.gpuGroup.source')">
<el-radio-group v-model="selectionMode" @change="changeSource">
<el-radio-button value="group">{{ $t('aiTools.gpuGroup.groups') }}</el-radio-button>
<el-radio-button value="custom">{{ $t('aiTools.gpuGroup.custom') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item
v-show="!groupEditor"
prop="gpu.mode"
:rules="gpuModeRules"
:error="model.error"
:label="model.enabled ? $t('aiTools.gpuGroup.source') : undefined"
>
<el-select
v-if="model.enabled && !groupEditor"
:model-value="gpuSource"
class="w-full"
@change="changeSource"
>
<el-option value="all" :label="$t('aiTools.model.gpuAll')" />
<el-option value="devices" :label="$t('aiTools.model.gpuSpecific')" />
<el-option v-if="imageType === 'nvidia'" value="count" :label="$t('aiTools.model.gpuCount')" />
<el-option v-if="hasMultipleGPUs" value="group" :label="$t('aiTools.gpuGroup.groups')" />
</el-select>
<span v-if="model.enabled && gpuSource === 'all'" class="input-help">
{{ $t('aiTools.model.gpuAllHelper') }}
</span>
<span v-if="model.enabled && gpuSource === 'count'" class="input-help">
{{ $t('aiTools.model.gpuCountHelper') }}
</span>
<span v-if="model.enabled && gpuSource === 'devices'" class="input-help">
{{ $t('aiTools.model.gpuSpecificHelper') }}
</span>
</el-form-item>
<template v-if="!groupEditor && model.enabled && hasMultipleGPUs">
<el-form-item
v-if="selectionMode === 'group'"
:label="$t('aiTools.gpuGroup.groups')"
prop="gpu.group"
:rules="groupRules"
>
<el-select :model-value="model.group?.id" class="w-full" fit-input-width @change="applyGroup">
<el-option
v-for="group in compatibleGroups"
:key="group.id"
class="gpu-group-option"
:value="group.id"
:label="group.name"
>
<span class="gpu-group-option-name" :title="group.name">{{ group.name }}</span>
<span
v-if="group.description"
class="gpu-group-option-description"
:title="group.description"
<div class="gpu-group-control">
<el-select :model-value="model.group?.id" class="w-full" fit-input-width @change="applyGroup">
<el-option
v-for="group in compatibleGroups"
:key="group.id"
class="gpu-group-option"
:value="group.id"
:label="group.name"
>
{{ group.description }}
</span>
</el-option>
<el-option
v-if="model.group && !compatibleGroups.some((group) => group.id === model.group?.id)"
:value="model.group.id"
:label="model.group.name"
disabled
/>
</el-select>
<span class="gpu-group-option-name" :title="group.name">{{ group.name }}</span>
<span
v-if="group.description"
class="gpu-group-option-description"
:title="group.description"
>
{{ group.description }}
</span>
</el-option>
<el-option
v-if="model.group && !compatibleGroups.some((group) => group.id === model.group?.id)"
:value="model.group.id"
:label="model.group.name"
disabled
/>
</el-select>
<el-button v-permission="'ai_gpu_manage'" @click="groupEditorVisible = true">
{{ $t('commons.button.add') }}
</el-button>
</div>
<span class="input-help">{{ $t('aiTools.gpuGroup.snapshotHelp') }}</span>
<span v-if="groupsFailed" class="input-help">{{ $t('aiTools.model.loadFailed') }}</span>
<template v-if="model.group">
@@ -80,35 +107,7 @@
</template>
</el-form-item>
</template>
<div v-show="groupEditor || selectionMode === 'custom'">
<el-form-item
v-show="!groupEditor"
prop="gpu.mode"
:rules="gpuModeRules"
:error="model.error"
:label="model.enabled ? $t('aiTools.model.gpuMode') : undefined"
>
<el-radio-group v-if="model.enabled && !groupEditor" v-model="model.mode" @change="changeMode">
<el-radio-button value="all">
{{ $t('aiTools.model.gpuAll') }}
</el-radio-button>
<el-radio-button v-if="imageType === 'nvidia'" value="count">
{{ $t('aiTools.model.gpuCount') }}
</el-radio-button>
<el-radio-button value="devices">
{{ $t('aiTools.model.gpuSpecific') }}
</el-radio-button>
</el-radio-group>
<span v-if="model.enabled && model.mode === 'all'" class="input-help">
{{ $t('aiTools.model.gpuAllHelper') }}
</span>
<span v-if="model.enabled && model.mode === 'count'" class="input-help">
{{ $t('aiTools.model.gpuCountHelper') }}
</span>
<span v-if="model.enabled && model.mode === 'devices'" class="input-help">
{{ $t('aiTools.model.gpuSpecificHelper') }}
</span>
</el-form-item>
<div v-show="groupEditor || !hasMultipleGPUs || selectionMode === 'custom'">
<template v-if="model.enabled">
<el-form-item
v-if="model.mode === 'count'"
@@ -153,82 +152,111 @@
{{ $t('aiTools.gpuGroup.selectedGPU', { count: model.deviceIDs.length }) }}
</span>
</el-form-item>
<template v-if="model.numa">
<el-form-item
:label="$t('aiTools.gpuGroup.affinity')"
prop="gpu.numa.mode"
:rules="numaRules"
:show-message="false"
>
<template #label>
<span class="gpu-capabilities-label">
{{ $t('aiTools.gpuGroup.affinity') }}
<el-tooltip placement="top">
<template #content>
<div class="gpu-capabilities-help">{{ $t('aiTools.model.numaHelp') }}</div>
</template>
<el-icon tabindex="0" :aria-label="$t('aiTools.model.numaHelp')">
<InfoFilled />
</el-icon>
</el-tooltip>
</span>
</template>
<el-radio-group v-model="model.numa.mode">
<el-radio-button value="off">{{ $t('aiTools.model.numaOff') }}</el-radio-button>
<el-radio-button value="auto" :disabled="model.mode === 'count'">
{{ $t('aiTools.gpuGroup.followGPU') }}
</el-radio-button>
<el-radio-button value="manual">{{ $t('aiTools.model.numaManual') }}</el-radio-button>
</el-radio-group>
<div class="numa-strategy-help" aria-live="polite">
<p class="input-help">
{{
$t(
model.numa.mode === 'off'
? 'aiTools.model.numaOffHelp'
: model.numa.mode === 'auto'
? 'aiTools.model.numaAutoHelp'
: 'aiTools.model.numaManualHelp',
)
}}
</p>
<p
v-if="model.numa.mode === 'auto' && !loading"
:class="numaError ? 'numa-strategy-warning' : 'input-help'"
>
{{
numaError ||
$t('aiTools.model.numaResolved', { node: selectedNUMAGPUs[0]?.numaNode })
}}
</p>
</div>
</el-form-item>
<el-form-item
v-if="model.numa.mode === 'manual'"
:label="$t('aiTools.model.numaNodes')"
prop="gpu.numa.nodes"
:rules="numaRules"
>
<el-select v-model="model.numa.nodes" multiple class="w-full">
<el-option
v-for="node in numaNodes"
:key="node.id"
:value="node.id"
:label="`NUMA ${node.id} · CPU ${node.cpus || '—'}`"
:disabled="!node.cpus || !node.memory"
/>
<el-option
v-for="id in missingNUMANodes"
:key="id"
:value="id"
:label="`NUMA ${id} (${$t('aiTools.model.numaUnavailable')})`"
disabled
/>
</el-select>
</el-form-item>
</template>
</template>
</div>
<p v-if="model.enabled && !numaNodes.length" class="input-help">
{{ $t('aiTools.model.numaTopologyUnavailable') }}
</p>
<details
v-if="model.enabled && model.numa && (numaNodes.length > 1 || numaBound)"
:open="numaBound"
class="form-section"
>
<summary class="form-section-header">
{{ $t('app.advanced') }} · {{ $t('aiTools.gpuGroup.affinity') }}
</summary>
<div class="form-section-body">
<el-form-item
:label="$t('aiTools.gpuGroup.affinity')"
prop="gpu.numa.mode"
:rules="numaRules"
:show-message="false"
>
<template #label>
<span class="gpu-capabilities-label">
{{ $t('aiTools.gpuGroup.affinity') }}
<el-tooltip placement="top">
<template #content>
<div class="gpu-capabilities-help">{{ $t('aiTools.model.numaHelp') }}</div>
</template>
<el-icon tabindex="0" :aria-label="$t('aiTools.model.numaHelp')">
<InfoFilled />
</el-icon>
</el-tooltip>
</span>
</template>
<el-radio-group
v-model="model.numa.mode"
@change="
selectionMode = 'custom';
model.group = undefined;
"
>
<el-radio-button value="off">{{ $t('aiTools.model.numaOff') }}</el-radio-button>
<el-radio-button value="auto" :disabled="numaNodes.length <= 1 || model.mode === 'count'">
{{ $t('aiTools.gpuGroup.followGPU') }}
</el-radio-button>
<el-radio-button value="manual" :disabled="numaNodes.length <= 1">
{{ $t('aiTools.model.numaManual') }}
</el-radio-button>
</el-radio-group>
<div class="numa-strategy-help" aria-live="polite">
<p class="input-help">
{{
$t(
model.numa.mode === 'off'
? 'aiTools.model.numaOffHelp'
: model.numa.mode === 'auto'
? 'aiTools.model.numaAutoHelp'
: 'aiTools.model.numaManualHelp',
)
}}
</p>
<p
v-if="model.numa.mode === 'auto' && !loading"
:class="numaError ? 'numa-strategy-warning' : 'input-help'"
>
{{
numaError ||
$t('aiTools.model.numaResolved', { node: selectedNUMAGPUs[0]?.numaNode })
}}
</p>
</div>
</el-form-item>
<el-form-item
v-if="model.numa.mode === 'manual'"
:label="$t('aiTools.model.numaNodes')"
prop="gpu.numa.nodes"
:rules="numaRules"
>
<el-select
v-model="model.numa.nodes"
multiple
class="w-full"
:disabled="numaNodes.length <= 1"
@change="
selectionMode = 'custom';
model.group = undefined;
"
>
<el-option
v-for="node in numaNodes"
:key="node.id"
:value="node.id"
:label="`NUMA ${node.id} · CPU ${node.cpus || '—'}`"
:disabled="!node.cpus || !node.memory"
/>
<el-option
v-for="id in missingNUMANodes"
:key="id"
:value="id"
:label="`NUMA ${id} (${$t('aiTools.model.numaUnavailable')})`"
disabled
/>
</el-select>
</el-form-item>
</div>
</details>
<p v-if="!groupEditor && model.enabled && model.numa && model.numa.mode !== 'off'" class="input-help">
{{ $t('aiTools.model.numaRequirements') }}
</p>
@@ -261,30 +289,45 @@
<span v-if="selectingDevices && gpuWarnings.length" class="input-help">{{ gpuWarnings.join('; ') }}</span>
</div>
</component>
<GroupOperate
v-if="!groupEditor && groupEditorVisible"
v-model:visible="groupEditorVisible"
:groups="groups"
:devices="gpuDevices || []"
:image-type="imageType"
@saved="groupCreated"
/>
</template>
<script setup lang="ts">
import { computed, ref } from 'vue';
import { computed, defineAsyncComponent, onBeforeUnmount, ref, watch } from 'vue';
import { InfoFilled } from '@element-plus/icons-vue';
import GPUTopology from '@/views/ai/components/gpu-topology/index.vue';
import { AI } from '@/api/interface/ai';
import { loadModelGPUDevices, listGPUGroups } from '@/api/modules/ai';
import i18n from '@/lang';
import { useGlobalStore } from '@/composables/useGlobalStore';
const props = withDefaults(defineProps<{ imageType?: string; collapsed?: boolean; groupEditor?: boolean }>(), {
imageType: 'nvidia',
collapsed: false,
groupEditor: false,
});
const GroupOperate = defineAsyncComponent(() => import('@/views/ai/gpu/groups/operate/index.vue'));
const groupEditorVisible = ref(false);
const { currentNode } = useGlobalStore();
const model = defineModel<AI.ModelGPUConfig>({ required: true });
const sectionRef = ref<HTMLDetailsElement>();
const loading = ref(false);
const gpuWarnings = ref<string[]>([]);
const gpuDevices = ref<AI.ModelGPUDevice[]>();
const hasMultipleGPUs = computed(() => (gpuDevices.value?.length || 0) > 1);
const numaNodes = ref<AI.ModelNUMANode[]>([]);
const numaBound = computed(() => Boolean(model.value.numa && model.value.numa.mode !== 'off'));
const groups = ref<AI.GPUGroup[]>([]);
const groupsFailed = ref(false);
const selectionMode = ref<'group' | 'custom'>('custom');
const gpuSource = computed(() => (selectionMode.value === 'group' ? 'group' : model.value.mode));
const compatibleGroups = computed(() => groups.value.filter((group) => group.imageType === props.imageType));
const currentGroup = computed(() => compatibleGroups.value.find((group) => group.id === model.value.group?.id));
const sourceChanged = computed(
@@ -298,6 +341,7 @@ const groupSummary = computed(() => {
.map((id) => gpuDevices.value?.find((device) => device.id === id)?.name || id)
.join(', ');
const config = model.value.numa;
if (numaNodes.value.length <= 1 && !numaBound.value) return devices;
const nodes =
config?.mode === 'auto'
? [...new Set(selectedNUMAGPUs.value.map((device) => device.numaNode).filter((id) => id !== undefined))]
@@ -316,7 +360,7 @@ const groupRules = [
{
validator: (_rule: unknown, _value: unknown, callback: (error?: Error) => void) => {
let error = '';
if (model.value.enabled && selectionMode.value === 'group') {
if (model.value.enabled && hasMultipleGPUs.value && selectionMode.value === 'group') {
if (!model.value.group) error = i18n.global.t('aiTools.gpuGroup.selectRequired');
else if (numaError.value) error = numaError.value;
else if (!gpuDevices.value) error = i18n.global.t('aiTools.model.loadFailed');
@@ -336,8 +380,19 @@ const groupRules = [
trigger: 'change',
},
];
const changeSource = () => {
if (selectionMode.value === 'custom') model.value.group = undefined;
const changeSource = (source: 'group' | AI.ModelGPUConfig['mode']) => {
if (source === 'group') {
selectionMode.value = 'group';
return;
}
selectionMode.value = 'custom';
model.value.group = undefined;
model.value.error = undefined;
if (model.value.mode !== source) {
model.value.mode = source;
model.value.deviceIDs = [];
model.value.count = source === 'count' ? 1 : undefined;
}
};
const applyGroup = (id: number) => {
const group = compatibleGroups.value.find((item) => item.id === id);
@@ -348,6 +403,26 @@ const applyGroup = (id: number) => {
group: { id: group.id, name: group.name, revision: group.revision },
};
};
const groupCreated = async (name: string) => {
const version = requestVersion;
const node = currentNode.value;
loading.value = true;
try {
const { data } = await listGPUGroups(node);
if (version !== requestVersion || node !== currentNode.value) return;
groups.value = data || [];
groupsFailed.value = false;
const group = compatibleGroups.value.find((item) => item.name === name);
if (group && selectionMode.value === 'group' && model.value.enabled) applyGroup(group.id);
} catch {
if (version === requestVersion && node === currentNode.value) groupsFailed.value = true;
} finally {
if (version === requestVersion) loading.value = false;
}
};
watch([() => props.imageType, currentNode], () => {
groupEditorVisible.value = false;
});
const selectedNUMAGPUs = computed(() =>
(gpuDevices.value || []).filter(
(device) =>
@@ -462,12 +537,6 @@ const gpuDeviceRules = [
},
];
const changeMode = () => {
model.value.error = undefined;
model.value.deviceIDs = [];
model.value.count = model.value.mode === 'count' ? 1 : undefined;
};
const changeEnabled = () => {
model.value.error = undefined;
if (model.value.enabled && sectionRef.value) {
@@ -486,6 +555,7 @@ const changeEnabled = () => {
let requestVersion = 0;
const init = async (create: boolean) => {
const version = ++requestVersion;
groupEditorVisible.value = false;
loading.value = true;
gpuDevices.value = undefined;
@@ -505,15 +575,7 @@ const init = async (create: boolean) => {
groups.value = [];
groupsFailed.value = false;
try {
const [devicesResult, groupsResult] = await Promise.allSettled([
loadModelGPUDevices(),
props.groupEditor ? Promise.resolve({ data: [] as AI.GPUGroup[] }) : listGPUGroups(),
]);
if (version !== requestVersion) return;
if (groupsResult.status === 'fulfilled') groups.value = groupsResult.value.data || [];
else groupsFailed.value = true;
if (devicesResult.status === 'rejected') throw devicesResult.reason;
const { data } = devicesResult.value;
const { data } = await loadModelGPUDevices();
if (version !== requestVersion) return;
gpuDevices.value = data.devices || [];
if (props.imageType === 'nvidia' && model.value.mode === 'devices') {
@@ -535,6 +597,18 @@ const init = async (create: boolean) => {
numaNodes.value = data.numaNodes || [];
gpuWarnings.value = data.warnings || [];
if (create) model.value.enabled = hasSupportedGPU.value;
if (!hasMultipleGPUs.value) {
selectionMode.value = 'custom';
model.value.group = undefined;
} else if (!props.groupEditor) {
try {
const { data: groupData } = await listGPUGroups();
if (version !== requestVersion) return;
groups.value = groupData || [];
} catch {
if (version === requestVersion) groupsFailed.value = true;
}
}
} catch {
} finally {
if (version === requestVersion) {
@@ -543,7 +617,11 @@ const init = async (create: boolean) => {
}
};
defineExpose({ init, loading });
onBeforeUnmount(() => {
requestVersion++;
});
defineExpose({ init, loading: computed(() => loading.value || groupEditorVisible.value) });
</script>
<style lang="scss" scoped>
@@ -576,6 +654,15 @@ defineExpose({ init, loading });
.group-editor .input-help {
width: 100%;
}
.gpu-group-control {
display: flex;
gap: 8px;
width: 100%;
}
.gpu-group-control > .el-select {
flex: 1;
min-width: 0;
}
.gpu-group-option {
height: auto;
padding-top: 10px;
@@ -4,19 +4,23 @@
v-for="section in sections"
:key="section.id ?? 'unknown'"
class="numa-node"
:class="{ unknown: section.id === undefined }"
:class="{ unknown: showTopology && section.id === undefined }"
>
<header class="numa-node-header">
<header v-if="showTopology" class="numa-node-header">
<div>
<strong>
{{ section.id === undefined ? $t('aiTools.gpuGroup.unknownNode') : `NUMA ${section.id}` }}
<el-tooltip
v-if="section.id === undefined"
:content="$t('aiTools.model.numaUnknown')"
:content="$t('aiTools.gpuGroup.unknownNodeHelp')"
placement="top"
:popper-style="{ maxWidth: 'min(320px, calc(100vw - 32px))' }"
>
<el-icon class="numa-info" tabindex="0" :aria-label="$t('aiTools.model.numaUnknown')">
<el-icon
class="numa-info"
tabindex="0"
:aria-label="$t('aiTools.gpuGroup.unknownNodeHelp')"
>
<InfoFilled />
</el-icon>
</el-tooltip>
@@ -88,7 +92,9 @@ const props = withDefaults(
{ selectable: false, cards: false },
);
const selected = defineModel<string[]>({ default: () => [] });
const showTopology = computed(() => props.nodes.length > 1 || (props.nodes.length === 1 && props.devices.length > 1));
const sections = computed(() => {
if (!showTopology.value) return props.devices.length ? [{ devices: props.devices }] : [];
const result: { id?: number; node?: AI.ModelNUMANode; devices: AI.ModelGPUDevice[] }[] = props.nodes.map(
(node) => ({
id: node.id,
@@ -208,11 +214,6 @@ const toggleNode = (devices: AI.ModelGPUDevice[], checked: boolean) => {
.unknown .numa-node-header strong::before {
background: var(--el-text-color-placeholder);
}
.numa-info {
color: var(--el-text-color-secondary);
font-size: 12px;
cursor: help;
}
.numa-resources {
display: flex;
flex-wrap: wrap;
@@ -285,4 +286,10 @@ const toggleNode = (devices: AI.ModelGPUDevice[], checked: boolean) => {
flex-wrap: wrap;
gap: 8px;
}
.numa-info {
color: var(--el-text-color-secondary);
font-size: 12px;
cursor: help;
}
</style>
+28 -172
View File
@@ -2,26 +2,27 @@
<div>
<RouterMenu />
<LayoutContent v-loading="loading" :title="$t('website.groupSetting')">
<template v-if="!noDevices" #leftToolBar>
<template v-if="!loading && !loadFailed && devices.length > 1" #leftToolBar>
<el-button v-permission="'ai_gpu_manage'" type="primary" :disabled="visible || loading" @click="open()">
{{ $t('commons.button.create') }}
</el-button>
</template>
<template v-if="!noDevices" #rightToolBar>
<template v-if="!noDevices && !singleGPU" #rightToolBar>
<TableRefresh :disabled="loading || visible" @search="load" />
</template>
<template v-if="!noDevices" #prompt>
<template v-if="!loading && !loadFailed && devices.length > 1" #prompt>
<p class="group-help">{{ $t('aiTools.gpuGroup.help') }}</p>
</template>
<template #main>
<el-alert
v-if="!loading && ['issues', 'loadFailed'].includes(environment.status)"
v-if="!loading && loadFailed"
class="mb-3"
:closable="false"
type="warning"
:title="$t(`aiTools.gpu.environment.${environment.status}`, { count: environment.issueCount })"
:title="$t('aiTools.model.loadFailed')"
/>
<el-empty v-if="noDevices" :description="$t('aiTools.gpu.environment.notDetected')" />
<el-empty v-else-if="singleGPU" :description="$t('aiTools.gpuGroup.singleGPU')" />
<GroupTopology
v-else-if="!loading && !loadFailed"
:key="currentNode"
@@ -30,89 +31,30 @@
:groups="groups"
@edit="open"
@remove="remove"
@create="open(undefined, $event)"
/>
</template>
</LayoutContent>
<DrawerPro
v-model="visible"
:header="$t(form.id ? 'commons.button.edit' : 'commons.button.create')"
:resource="$t('aiTools.gpuGroup.groups')"
size="large"
:auto-close="false"
confirm-before-close
@before-close="close"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
label-position="top"
v-loading="saving"
:disabled="saving"
@submit.prevent
>
<h3 class="group-form-heading">{{ $t('home.baseInfo') }}</h3>
<el-form-item :label="$t('commons.table.name')" prop="name">
<el-input v-model.trim="form.name" maxlength="128" clearable />
</el-form-item>
<el-form-item :label="$t('aiTools.gpuGroup.vendor')" prop="imageType">
<el-select v-model="form.imageType" @change="changeVendor">
<el-option
v-for="vendor in ['nvidia', 'intel', 'ascend']"
:key="vendor"
:value="vendor"
:label="vendor === 'nvidia' ? 'NVIDIA' : vendor === 'intel' ? 'Intel' : 'Ascend'"
/>
</el-select>
</el-form-item>
<GPUConfig ref="gpuRef" v-model="form.gpu" :image-type="form.imageType" group-editor>
<template #device-meta="{ device }">
<span
v-if="
groups.some((group) => group.id !== form.id && group.gpu.deviceIDs.includes(device.id))
"
class="device-existing-groups"
>
{{ $t('aiTools.gpuGroup.groups') }} ·
{{
groups
.filter((group) => group.id !== form.id && group.gpu.deviceIDs.includes(device.id))
.map((group) => group.name)
.join(', ')
}}
</span>
</template>
</GPUConfig>
<div v-if="form.id" class="input-help">{{ $t('aiTools.gpuGroup.snapshotHelp') }}</div>
<el-form-item :label="$t('commons.table.description')" prop="description">
<el-input v-model="form.description" type="textarea" :rows="2" maxlength="500" show-word-limit />
</el-form-item>
</el-form>
<template #footer>
<el-button :disabled="saving" @click="visible = false">{{ $t('commons.button.cancel') }}</el-button>
<el-button type="primary" :loading="saving" :disabled="gpuRef?.loading" @click="save">
{{ $t('commons.button.confirm') }}
</el-button>
</template>
</DrawerPro>
<GroupOperate
v-if="visible"
v-model:visible="visible"
:group="editingGroup"
:groups="groups"
:devices="devices"
@saved="load"
/>
</div>
</template>
<script setup lang="ts">
import { computed, nextTick, onMounted, onActivated, ref, watch } from 'vue';
import { ElMessageBox, FormInstance } from 'element-plus';
import { computed, onMounted, onActivated, ref, watch } from 'vue';
import { ElMessageBox } from 'element-plus';
import { AI } from '@/api/interface/ai';
import { deleteGPUGroup, listGPUGroups, loadGPUInfo, loadModelGPUDevices, saveGPUGroup } from '@/api/modules/ai';
import GPUConfig from '@/views/ai/components/gpu-config/index.vue';
import { deleteGPUGroup, listGPUGroups, loadModelGPUDevices } from '@/api/modules/ai';
import GroupOperate from './operate/index.vue';
import GroupTopology from './topology.vue';
import RouterMenu from '../index.vue';
import { getGPUEnvironmentState } from '../environment';
import i18n from '@/lang';
import { MsgSuccess } from '@/utils/message';
import { useGlobalStore } from '@/composables/useGlobalStore';
import { Rules } from '@/global/form-rules';
import DrawerPro from '@/components/drawer-pro/index.vue';
const { currentNode } = useGlobalStore();
@@ -130,37 +72,10 @@ const numaDevices = computed(() => {
});
const loading = ref(false);
const loadFailed = ref(false);
const gpuInfo = ref<AI.Info>();
const environment = computed(() => getGPUEnvironmentState(gpuInfo.value, loadFailed.value));
const noDevices = computed(() => !loading.value && environment.value.status === 'notDetected' && !groups.value.length);
const saving = ref(false);
const noDevices = computed(() => !loading.value && !loadFailed.value && devices.value.length === 0);
const singleGPU = computed(() => !loading.value && !loadFailed.value && devices.value.length === 1);
const visible = ref(false);
const formRef = ref<FormInstance>();
const gpuRef = ref<InstanceType<typeof GPUConfig>>();
const emptyGPU = (): AI.ModelGPUConfig => ({
enabled: true,
mode: 'devices',
deviceIDs: [],
capabilities: ['gpu', 'utility', 'compute'],
numa: { mode: 'off', nodes: [] },
});
const form = ref({ id: 0, name: '', description: '', imageType: 'nvidia', gpu: emptyGPU() });
const rules = {
name: [
Rules.requiredInput,
{
validator: (_rule: unknown, value: string, callback: (error?: Error) => void) => {
callback(
groups.value.some((group) => group.id !== form.value.id && group.name === value.trim())
? new Error(i18n.global.t('commons.rule.duplicate'))
: undefined,
);
},
trigger: 'blur',
},
],
imageType: [Rules.requiredSelect],
};
const editingGroup = ref<AI.GPUGroup>();
let requestVersion = 0;
const load = async () => {
const version = ++requestVersion;
@@ -168,14 +83,11 @@ const load = async () => {
loading.value = true;
loadFailed.value = false;
try {
const [groupResult, deviceResult, infoResult] = await Promise.all([
listGPUGroups(node),
loadModelGPUDevices(node),
loadGPUInfo(true, node),
]);
const deviceResult = await loadModelGPUDevices(node);
if (version !== requestVersion || node !== currentNode.value) return;
gpuInfo.value = infoResult.data;
groups.value = groupResult.data || [];
const groupResult = deviceResult.data.devices?.length > 1 ? await listGPUGroups(node) : undefined;
if (version !== requestVersion || node !== currentNode.value) return;
groups.value = groupResult?.data || [];
devices.value = deviceResult.data.devices || [];
numaNodes.value = deviceResult.data.numaNodes || [];
} catch (error) {
@@ -185,53 +97,9 @@ const load = async () => {
if (version === requestVersion) loading.value = false;
}
};
const open = async (group?: AI.GPUGroup, deviceIDs: string[] = []) => {
form.value = group
? {
id: group.id,
name: group.name,
description: group.description || '',
imageType: group.imageType,
gpu: JSON.parse(JSON.stringify(group.gpu)),
}
: {
id: 0,
name: '',
description: '',
imageType:
devices.value.find((device) => deviceIDs.includes(device.id))?.type ||
devices.value.find((device) => device.available)?.type ||
'nvidia',
gpu: { ...emptyGPU(), deviceIDs },
};
const open = (group?: AI.GPUGroup) => {
editingGroup.value = group;
visible.value = true;
await nextTick();
formRef.value?.clearValidate();
await gpuRef.value?.init(false);
};
const changeVendor = async () => {
form.value.gpu = emptyGPU();
await nextTick();
formRef.value?.clearValidate();
await gpuRef.value?.init(false);
};
const close = (done: () => void) => {
if (!saving.value) done();
};
const save = async () => {
if (saving.value || gpuRef.value?.loading) return;
const node = currentNode.value;
if (!(await formRef.value?.validate().catch(() => false))) return;
if (node !== currentNode.value) return;
saving.value = true;
try {
await saveGPUGroup(form.value);
visible.value = false;
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
await load();
} finally {
saving.value = false;
}
};
const remove = async (group: AI.GPUGroup) => {
const node = currentNode.value;
@@ -250,8 +118,7 @@ onActivated(() => {
});
watch(currentNode, () => {
visible.value = false;
form.value = { id: 0, name: '', description: '', imageType: 'nvidia', gpu: emptyGPU() };
gpuInfo.value = undefined;
editingGroup.value = undefined;
groups.value = [];
devices.value = [];
numaNodes.value = [];
@@ -266,15 +133,4 @@ watch(currentNode, () => {
font-size: 12px;
line-height: 20px;
}
.group-form-heading {
font-size: 14px;
font-weight: 600;
margin: 0 0 16px;
}
.device-existing-groups {
width: 100%;
font-size: 12px;
line-height: 20px;
color: var(--el-text-color-secondary);
}
</style>
@@ -0,0 +1,191 @@
<template>
<DrawerPro
v-model="visible"
:header="$t(form.id ? 'commons.button.edit' : 'commons.button.create')"
:resource="$t('aiTools.gpuGroup.groups')"
size="large"
:auto-close="false"
confirm-before-close
@before-close="close"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
label-position="top"
v-loading="initializing || saving"
:disabled="initializing || saving"
@submit.prevent
>
<h3 class="group-form-heading">{{ $t('home.baseInfo') }}</h3>
<el-form-item :label="$t('commons.table.name')" prop="name">
<el-input v-model.trim="form.name" maxlength="128" clearable />
</el-form-item>
<el-form-item :label="$t('aiTools.gpuGroup.vendor')" prop="imageType">
<el-select v-model="form.imageType" :disabled="!!imageType" @change="changeVendor">
<el-option
v-for="vendor in vendorOptions"
:key="vendor.value"
:value="vendor.value"
:label="`${vendor.label} (${vendor.count})`"
:disabled="vendor.count === 0"
/>
</el-select>
</el-form-item>
<GPUConfig ref="gpuRef" v-model="form.gpu" :image-type="form.imageType" group-editor>
<template #device-meta="{ device }">
<span
v-if="groups.some((group) => group.id !== form.id && group.gpu.deviceIDs.includes(device.id))"
class="device-existing-groups"
>
{{ $t('aiTools.gpuGroup.groups') }} ·
{{
groups
.filter((group) => group.id !== form.id && group.gpu.deviceIDs.includes(device.id))
.map((group) => group.name)
.join(', ')
}}
</span>
</template>
</GPUConfig>
<div v-if="form.id" class="input-help">{{ $t('aiTools.gpuGroup.snapshotHelp') }}</div>
<el-form-item :label="$t('commons.table.description')" prop="description">
<el-input v-model="form.description" type="textarea" :rows="2" maxlength="500" show-word-limit />
</el-form-item>
</el-form>
<template #footer>
<el-button :disabled="saving" @click="visible = false">{{ $t('commons.button.cancel') }}</el-button>
<el-button type="primary" :loading="saving" :disabled="initializing || gpuRef?.loading" @click="save">
{{ $t('commons.button.confirm') }}
</el-button>
</template>
</DrawerPro>
</template>
<script setup lang="ts">
import { computed, nextTick, onMounted, ref, watch } from 'vue';
import { FormInstance } from 'element-plus';
import { AI } from '@/api/interface/ai';
import { saveGPUGroup } from '@/api/modules/ai';
import GPUConfig from '@/views/ai/components/gpu-config/index.vue';
import DrawerPro from '@/components/drawer-pro/index.vue';
import { useGlobalStore } from '@/composables/useGlobalStore';
import { Rules } from '@/global/form-rules';
import { MsgSuccess } from '@/utils/message';
import i18n from '@/lang';
const props = defineProps<{
group?: AI.GPUGroup;
groups: AI.GPUGroup[];
devices: AI.ModelGPUDevice[];
imageType?: string;
}>();
const visible = defineModel<boolean>('visible', { required: true });
const emit = defineEmits<{ saved: [name: string] }>();
const { currentNode } = useGlobalStore();
const initializing = ref(true);
const vendorOptions = computed(() =>
[
{ value: 'nvidia', label: 'NVIDIA' },
{ value: 'intel', label: 'Intel' },
{ value: 'ascend', label: 'Ascend' },
].map((vendor) => ({
...vendor,
count: props.devices.filter((device) => device.type === vendor.value && device.available).length,
})),
);
const saving = ref(false);
const formRef = ref<FormInstance>();
const gpuRef = ref<InstanceType<typeof GPUConfig>>();
const emptyGPU = (): AI.ModelGPUConfig => ({
enabled: true,
mode: 'devices',
deviceIDs: [],
capabilities: ['gpu', 'utility', 'compute'],
numa: { mode: 'off', nodes: [] },
});
const form = ref(
props.group
? {
id: props.group.id,
name: props.group.name,
description: props.group.description || '',
imageType: props.group.imageType,
gpu: JSON.parse(JSON.stringify(props.group.gpu)) as AI.ModelGPUConfig,
}
: {
id: 0,
name: '',
description: '',
imageType: props.imageType || props.devices.find((device) => device.available)?.type || 'nvidia',
gpu: emptyGPU(),
},
);
const rules = {
name: [
Rules.requiredInput,
{
validator: (_rule: unknown, value: string, callback: (error?: Error) => void) => {
callback(
props.groups.some((group) => group.id !== form.value.id && group.name === value.trim())
? new Error(i18n.global.t('commons.rule.duplicate'))
: undefined,
);
},
trigger: 'blur',
},
],
imageType: [Rules.requiredSelect],
};
const changeVendor = async () => {
form.value.gpu = emptyGPU();
await nextTick();
formRef.value?.clearValidate();
await gpuRef.value?.init(false);
};
const close = (done: () => void) => {
if (!saving.value) done();
};
const save = async () => {
if (initializing.value || saving.value || gpuRef.value?.loading) return;
const node = currentNode.value;
if (!(await formRef.value?.validate().catch(() => false))) return;
if (node !== currentNode.value) return;
saving.value = true;
try {
const name = form.value.name.trim();
await saveGPUGroup(form.value);
if (node !== currentNode.value) return;
visible.value = false;
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
emit('saved', name);
} finally {
saving.value = false;
}
};
onMounted(async () => {
try {
await nextTick();
await gpuRef.value?.init(false);
} finally {
initializing.value = false;
}
});
watch(currentNode, () => {
visible.value = false;
});
</script>
<style lang="scss" scoped>
.group-form-heading {
font-size: 14px;
font-weight: 600;
margin: 0 0 16px;
}
.device-existing-groups {
width: 100%;
font-size: 12px;
line-height: 20px;
color: var(--el-text-color-secondary);
}
</style>
+15 -74
View File
@@ -1,5 +1,6 @@
<template>
<el-card shadow="never" class="relation-card">
<p v-if="!nodes.length" class="input-help">{{ $t('aiTools.model.numaTopologyUnavailable') }}</p>
<div ref="board" class="relation-board">
<svg class="relation-lines" aria-hidden="true">
<path v-for="line in lines" :key="line.key" :d="line.path" :class="{ active: line.active }" />
@@ -18,14 +19,14 @@
{{ section.label }}
<el-tooltip
v-if="section.key === 'unassigned'"
:content="$t('aiTools.model.numaUnknown')"
:content="$t('aiTools.gpuGroup.unknownNodeHelp')"
placement="top"
:popper-style="{ maxWidth: 'min(320px, calc(100vw - 32px))' }"
>
<el-icon
class="numa-info"
tabindex="0"
:aria-label="$t('aiTools.model.numaUnknown')"
:aria-label="$t('aiTools.gpuGroup.unknownNodeHelp')"
>
<InfoFilled />
</el-icon>
@@ -33,15 +34,6 @@
</strong>
<div v-if="section.node" class="input-help">CPU {{ section.node.cpus || '—' }}</div>
</div>
<el-button
v-if="section.node"
v-permission="'ai_gpu_manage'"
link
type="primary"
@click="createFromNode(section.node.id, section.devices)"
>
{{ $t('commons.button.create') }}
</el-button>
</header>
<div
v-for="device in section.devices"
@@ -66,17 +58,6 @@
<el-tag v-if="!device.available" size="small" type="warning">
{{ $t('aiTools.model.gpuMissing') }}
</el-tag>
<el-button
v-permission="'ai_gpu_manage'"
link
type="primary"
class="device-create"
:disabled="!device.available"
:aria-label="`${$t('commons.button.create')} · ${device.name}`"
@click="$emit('create', [device.id])"
>
{{ $t('commons.button.create') }}
</el-button>
<span class="relation-port" />
</div>
<span v-if="!section.devices.length" class="input-help">
@@ -106,7 +87,7 @@
: { type: 'group', id: group.id }
"
>
<strong>{{ group.name || $t('commons.button.create') }}</strong>
<strong>{{ group.name }}</strong>
<span class="input-help">{{ group.gpu.deviceIDs.length }} GPU · {{ group.imageType }}</span>
</button>
<span class="relation-port" />
@@ -136,7 +117,7 @@
</div>
<p v-if="focusedGroup.description" class="detail-description">{{ focusedGroup.description }}</p>
<dl class="detail-fields">
<div>
<div v-if="nodes.length > 1 || (focusedGroup.gpu.numa && focusedGroup.gpu.numa.mode !== 'off')">
<dt>{{ $t('aiTools.gpuGroup.affinity') }}</dt>
<dd>
<span>
@@ -188,15 +169,6 @@
{{ $t('aiTools.model.gpuMissing') }}
</el-tag>
</div>
<el-button
v-permission="'ai_gpu_manage'"
link
type="primary"
:disabled="!focusedDevice.available"
@click="$emit('create', [focusedDevice.id])"
>
{{ $t('commons.button.create') }}
</el-button>
</div>
<dl class="detail-fields device-fields">
<div>
@@ -225,10 +197,9 @@
</template>
<script setup lang="ts">
import { computed, h, nextTick, ref, watch } from 'vue';
import { InfoFilled } from '@element-plus/icons-vue';
import { ElMessageBox } from 'element-plus';
import { computed, nextTick, ref, watch } from 'vue';
import { useResizeObserver } from '@vueuse/core';
import { InfoFilled } from '@element-plus/icons-vue';
import { AI } from '@/api/interface/ai';
import i18n from '@/lang';
@@ -237,13 +208,14 @@ const props = defineProps<{
nodes: AI.ModelNUMANode[];
groups: AI.GPUGroup[];
}>();
const emit = defineEmits<{ create: [ids: string[]]; edit: [group: AI.GPUGroup]; remove: [group: AI.GPUGroup] }>();
defineEmits<{ edit: [group: AI.GPUGroup]; remove: [group: AI.GPUGroup] }>();
const focus = ref<{ type: 'device'; id: string } | { type: 'group'; id: number }>();
const board = ref<HTMLElement>();
const hardware = ref<HTMLElement>();
const groupColumn = ref<HTMLElement>();
const lines = ref<{ key: string; path: string; active: boolean }[]>([]);
const sections = computed(() => {
if (!props.nodes.length) return [{ key: 'devices', label: '', devices: props.devices }];
const available = props.devices.filter((device) => device.available);
const result: { key: string; label: string; node?: AI.ModelNUMANode; devices: AI.ModelGPUDevice[] }[] =
props.nodes.map((node) => ({
@@ -293,34 +265,6 @@ const focusedGroup = computed(() =>
const focusedDevice = computed(() =>
props.devices.find((device) => focus.value?.type === 'device' && device.id === focus.value.id),
);
const createFromNode = async (node: number, devices: AI.ModelGPUDevice[]) => {
const available = devices.filter((device) => device.available);
if (!available.length) {
await ElMessageBox.alert(
h('div', [
h('p', i18n.global.t('aiTools.gpuGroup.emptyNodeCreate', { node })),
h('p', { class: 'mt-3' }, i18n.global.t('aiTools.gpuGroup.inspectNUMA')),
h(
'pre',
{ class: 'my-3', style: { whiteSpace: 'pre-wrap', overflowWrap: 'anywhere' } },
'lspci -Dnn\ngrep -H . /sys/bus/pci/devices/*/numa_node',
),
h('p', i18n.global.t('aiTools.gpuGroup.numaQueryHint')),
]),
i18n.global.t('commons.msg.infoTitle'),
{
type: 'info',
confirmButtonText: i18n.global.t('commons.button.confirm'),
customStyle: { width: '640px', maxWidth: 'calc(100vw - 32px)' },
},
).catch(() => {});
return;
}
emit(
'create',
available.filter((device) => device.type === available[0].type).map((device) => device.id),
);
};
const drawLines = () => {
if (!board.value) return;
const rect = board.value.getBoundingClientRect();
@@ -434,11 +378,6 @@ h3 {
align-items: center;
gap: 8px;
}
.numa-info {
color: var(--el-text-color-secondary);
font-size: 12px;
cursor: help;
}
.numa-section.unassigned {
border-style: dashed;
}
@@ -462,10 +401,6 @@ h3 {
min-width: 0;
width: auto;
}
.device-create {
flex-shrink: 0;
margin-left: auto;
}
.device-node.active,
.relation-group.active {
border-color: var(--el-color-primary-light-5);
@@ -631,4 +566,10 @@ h3 {
grid-template-columns: minmax(0, 1fr) 32px minmax(0, 1fr);
}
}
.numa-info {
color: var(--el-text-color-secondary);
font-size: 12px;
cursor: help;
}
</style>