From 10a37c263a436a176cd82b5e2a688882acbd99f4 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Mon, 20 Nov 2023 07:30:57 +0000 Subject: change: small gpu proc changes (#1325) * other: use consistent casing with Mem/Mem% in processes for GPU cols * other: remove mem check for GPU enable check --- src/options.rs | 2 +- src/widgets/process_table/proc_widget_column.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/options.rs b/src/options.rs index 031b3cc4..a4d55047 100644 --- a/src/options.rs +++ b/src/options.rs @@ -433,7 +433,7 @@ pub fn build_app( use_cpu: used_widget_set.get(&Cpu).is_some() || used_widget_set.get(&BasicCpu).is_some(), use_mem, use_cache: use_mem && get_enable_cache_memory(matches, config), - use_gpu: use_mem && get_enable_gpu(matches, config), + use_gpu: get_enable_gpu(matches, config), use_net: used_widget_set.get(&Net).is_some() || used_widget_set.get(&BasicNet).is_some(), use_proc: used_widget_set.get(&Proc).is_some(), use_disk: used_widget_set.get(&Disk).is_some(), diff --git a/src/widgets/process_table/proc_widget_column.rs b/src/widgets/process_table/proc_widget_column.rs index ca32b0e3..e68cad94 100644 --- a/src/widgets/process_table/proc_widget_column.rs +++ b/src/widgets/process_table/proc_widget_column.rs @@ -91,9 +91,9 @@ impl ColumnHeader for ProcColumn { ProcColumn::User => "User", ProcColumn::Time => "Time", #[cfg(feature = "gpu")] - ProcColumn::GpuMem => "GMEM", + ProcColumn::GpuMem => "GMem", #[cfg(feature = "gpu")] - ProcColumn::GpuMemPercent => "GMEM%", + ProcColumn::GpuMemPercent => "GMem%", #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => "GPU%", } @@ -117,9 +117,9 @@ impl ColumnHeader for ProcColumn { ProcColumn::User => "User", ProcColumn::Time => "Time", #[cfg(feature = "gpu")] - ProcColumn::GpuMem => "GMEM", + ProcColumn::GpuMem => "GMem", #[cfg(feature = "gpu")] - ProcColumn::GpuMemPercent => "GMEM%", + ProcColumn::GpuMemPercent => "GMem%", #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => "GPU%", } -- cgit v1.2.3