|
75 | 75 | :disabled="!summary.sharedMemoryOnly && !summary.memoryPartial" |
76 | 76 | :content="summaryMemoryTooltip(summary)" |
77 | 77 | > |
78 | | - <strong v-if="!summary.sharedMemoryOnly && summary.memoryUsage"> |
| 78 | + <strong v-if="summary.memoryUsage"> |
79 | 79 | {{ $t('home.used') }} {{ formatSummaryMemory(summary.memoryUsage.used) }} / |
80 | 80 | {{ formatSummaryMemory(summary.memoryUsage.total) }} |
81 | 81 | <template v-if="summary.memoryUsage.percentage !== null"> |
|
97 | 97 | <span class="whitespace-normal"> |
98 | 98 | {{ |
99 | 99 | $t('aiTools.gpu.environment.sharedMemory', { |
100 | | - memory: formatSummaryMemory(summary.sharedMemoryTotal), |
| 100 | + memory: sharedMemoryUsage |
| 101 | + ? `${$t('home.used')} ${formatSummaryMemory(sharedMemoryUsage.used)} / ${formatSummaryMemory(sharedMemoryUsage.total)}` |
| 102 | + : formatSummaryMemory(summary.sharedMemoryTotal), |
101 | 103 | }) |
102 | 104 | }} |
| 105 | + <template v-if="sharedMemoryUsage && sharedMemoryUsage.percentage !== null"> |
| 106 | + ({{ sharedMemoryUsage.percentage }}%) |
| 107 | + </template> |
103 | 108 | </span> |
104 | 109 | </el-tooltip> |
105 | 110 | </div> |
@@ -740,6 +745,18 @@ const formatSummaryMemory = (value: number | null) => { |
740 | 745 | return value === null || !Number.isFinite(value) ? '—' : computeSizeForDocker(value); |
741 | 746 | }; |
742 | 747 |
|
| 748 | +const sharedMemoryUsage = computed(() => { |
| 749 | + const device = gpuInfo.value.gpu.find((device) => device.sharedMemory); |
| 750 | + if (!device) return null; |
| 751 | + const used = memoryMiB(device.memUsed); |
| 752 | + const total = memoryMiB(device.memTotal); |
| 753 | + return { |
| 754 | + used: used !== null && used >= 0 ? used * 1024 ** 2 : null, |
| 755 | + total: total !== null && total >= 0 ? total * 1024 ** 2 : null, |
| 756 | + percentage: used !== null && used >= 0 ? memoryPercentage(device) : null, |
| 757 | + }; |
| 758 | +}); |
| 759 | +
|
743 | 760 | const summaryMemoryUsage = (vendor?: string) => { |
744 | 761 | const devices = [ |
745 | 762 | ...[...gpuInfo.value.gpu, ...gpuInfo.value.npu] |
@@ -789,15 +806,16 @@ const overviewRows = computed(() => { |
789 | 806 | const devices = gpuInfo.value.gpu.filter((device) => device.type === summary.vendor); |
790 | 807 | const sharedMemoryTotal = |
791 | 808 | devices.length && !devices.some((device) => device.sharedMemory) ? null : summary.sharedMemoryTotal; |
| 809 | + const sharedMemoryOnly = |
| 810 | + summary.memoryTotal === null && |
| 811 | + sharedMemoryTotal !== null && |
| 812 | + devices.every((device) => device.sharedMemory); |
792 | 813 | return { |
793 | 814 | ...summary, |
794 | | - memoryUsage: summaryMemoryUsage(summary.vendor), |
| 815 | + memoryUsage: sharedMemoryOnly ? sharedMemoryUsage.value : summaryMemoryUsage(summary.vendor), |
795 | 816 | sharedMemoryTotal, |
796 | 817 | cardCountText: summary.cardCount === null ? '—' : String(summary.cardCount), |
797 | | - sharedMemoryOnly: |
798 | | - summary.memoryTotal === null && |
799 | | - sharedMemoryTotal !== null && |
800 | | - devices.every((device) => device.sharedMemory), |
| 818 | + sharedMemoryOnly, |
801 | 819 | }; |
802 | 820 | }); |
803 | 821 | } |
@@ -833,16 +851,17 @@ const overviewRows = computed(() => { |
833 | 851 | memoryTotal = (memoryTotal ?? 0) + bytes; |
834 | 852 | } |
835 | 853 | } |
| 854 | + const sharedMemoryOnly = sharedMemoryTotal !== null && memoryDevices.every((device) => device.shared); |
836 | 855 | return [ |
837 | 856 | { |
838 | 857 | vendor: gpuInfo.value.type, |
839 | 858 | driverVersion: gpuInfo.value.driverVersion, |
840 | 859 | cudaVersion: gpuInfo.value.cudaVersion, |
841 | 860 | cardCountText: deviceCountText.value, |
842 | 861 | memoryTotal, |
843 | | - memoryUsage: summaryMemoryUsage(), |
| 862 | + memoryUsage: sharedMemoryOnly ? sharedMemoryUsage.value : summaryMemoryUsage(), |
844 | 863 | sharedMemoryTotal, |
845 | | - sharedMemoryOnly: sharedMemoryTotal !== null && memoryDevices.every((device) => device.shared), |
| 864 | + sharedMemoryOnly, |
846 | 865 | memoryPartial, |
847 | 866 | }, |
848 | 867 | ]; |
|
0 commit comments