Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: style list of gpus on system monitor #2172

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix: style list of gpus on system monitor #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 24 additions & 35 deletions web/containers/Layout/BottomBar/SystemMonitor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,6 @@ const SystemMonitor = () => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [])

const calculateUtilization = () => {
let sum = 0
const util = gpus.map((x) => {
return Number(x['utilization'])
})
util.forEach((num) => {
sum += num
})
return sum
}

return (
<Fragment>
<div
Expand Down Expand Up @@ -131,10 +120,11 @@ const SystemMonitor = () => {
</div>
</div>
<div className="mb-4 border-b border-border pb-4">
<div className="flex items-center gap-2">
<div className="flex items-center justify-between gap-2">
<h6 className="font-bold">Memory</h6>
<span className="text-xs text-muted-foreground">
{toGibibytes(usedRam)} of {toGibibytes(totalRam)} used
<span className="text-sm text-muted-foreground">
{toGibibytes(usedRam, { hideUnit: true })}/
{toGibibytes(totalRam, { hideUnit: true })} GB
</span>
</div>
<div className="flex items-center gap-x-4">
Expand All @@ -148,31 +138,30 @@ const SystemMonitor = () => {
</div>
</div>
{gpus.length > 0 && (
<div className="mb-4 border-b border-border pb-4">
<h6 className="font-bold">GPU</h6>
<div className="flex items-center gap-x-4">
<Progress value={calculateUtilization()} className="h-2" />
<span className="flex-shrink-0 text-muted-foreground">
{calculateUtilization()}%
</span>
</div>
<div className="mb-4 border-b border-border pb-4 last:border-none">
{gpus.map((gpu, index) => (
<div
key={index}
className="mt-4 flex items-start justify-between gap-4"
>
<span className="line-clamp-1 w-1/2 font-medium text-muted-foreground">
{gpu.name}
</span>
<div className="flex gap-x-2">
<span className="font-semibold">
{gpu.utilization}%
<div key={index} className="mt-4 flex flex-col gap-2">
<div className="flex w-full items-start justify-between">
<span className="line-clamp-1 w-1/2 font-bold">
{gpu.name}
</span>
<div>
<span className="font-semibold">{gpu.vram}</span>
<span>MB VRAM</span>
<div className="flex gap-x-2">
<div className="text-muted-foreground">
<span>
{gpu.memoryTotal - gpu.memoryFree}/
{gpu.memoryTotal}
</span>
<span> MB</span>
</div>
</div>
</div>

<div className="flex items-center gap-x-4">
<Progress value={gpu.utilization} className="h-2" />
<span className="flex-shrink-0 text-muted-foreground">
{gpu.utilization}%
</span>
</div>
</div>
))}
</div>
Expand Down
13 changes: 8 additions & 5 deletions web/utils/converter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
export const toGibibytes = (input: number) => {
export const toGibibytes = (
input: number,
options?: { hideUnit?: boolean }
) => {
if (!input) return ''
if (input > 1024 ** 3) {
return (input / 1024 ** 3).toFixed(2) + 'GB'
return (input / 1024 ** 3).toFixed(2) + (options?.hideUnit ? '' : 'GB')
} else if (input > 1024 ** 2) {
return (input / 1024 ** 2).toFixed(2) + 'MB'
return (input / 1024 ** 2).toFixed(2) + (options?.hideUnit ? '' : 'MB')
} else if (input > 1024) {
return (input / 1024).toFixed(2) + 'KB'
return (input / 1024).toFixed(2) + (options?.hideUnit ? '' : 'KB')
} else {
return input + 'B'
return input + (options?.hideUnit ? '' : 'B')
}
}

Expand Down