Merge pull request #6 from AtelierArith/terasaki/support-apple-M-series-monitoring

Support apple M series monitoring

Author: terasakisatoshi

Project.toml

@@ -9,18 +9,21 @@ MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
 Term = "22787eb5-b846-44ae-b979-8e399b8463ab"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 
-[extensions]
-TerminalSystemMonitorCUDAExt = "CUDA"
-
 [weakdeps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
+MacOSIOReport = "27799fc1-e272-4181-9793-a9e1fcba685b"
+
+[extensions]
+TerminalSystemMonitorCUDAExt = "CUDA"
+TerminalSystemMonitorMacOSIOReportExt = "MacOSIOReport"
 
 [compat]
 Aqua = "0.8.9"
 CUDA = "5.5.2"
 Dates = "1"
 JET = "0.9.12"
 MLDataDevices = "1.5.3"
+MacOSIOReport = "0.1.0"
 ReTestItems = "1.29.0"
 Term = "2.0.6"
 Test = "1"
@@ -29,10 +32,9 @@ julia = "1.10"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
-CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "JET", "ReTestItems", "Test", "CUDA"]
+test = ["Aqua", "JET", "ReTestItems", "Test"]

ext/TerminalSystemMonitorCUDAExt/TerminalSystemMonitorCUDAExt.jl

@@ -11,7 +11,7 @@ function _plot_gpu_utilization_rates(gpu_id, dev::CUDA.CuDevice)
     nvml_dev = CUDA.NVML.Device(uuid(dev); mig)
     x = string(gpu_id)
     y = 100 * CUDA.NVML.utilization_rates(nvml_dev).compute
-    return barplot([x], [y], maximum = 100, width = max(5, 15))
+    return barplot([x], [y], maximum = 100, width = 15)
 end
 
 function TerminalSystemMonitor.plot_gpu_utilization_rates(::Type{CUDADevice})
@@ -56,7 +56,7 @@ function _plot_gpu_memory_utilization(dev::CUDA.CuDevice)
         # Adds a space for better styling
         name = " $(memorytotal) $(memorytotal_unit)",
         maximum = memorytotal,
-        width = max(5, 15),
+        width = 15,
     )
 end
 

ext/TerminalSystemMonitorMacOSIOReportExt/TerminalSystemMonitorMacOSIOReportExt.jl

@@ -0,0 +1,42 @@
+module TerminalSystemMonitorMacOSIOReportExt
+
+using MLDataDevices: MetalDevice
+using UnicodePlots: barplot
+import TerminalSystemMonitor
+using MacOSIOReport: Sampler, get_metrics, MTLDevice
+using TerminalSystemMonitor: extract_number_and_unit
+
+function _plot_cpu_utilization_rates(id, usage)
+    x = string(id)
+    y = usage
+    return barplot([x], [y], maximum = 100, width = 15)
+end
+
+function TerminalSystemMonitor.plot_cpu_utilization_rates(::Type{MetalDevice})
+    sampler = Sampler()
+    msec = UInt(500)
+    m = get_metrics(sampler, msec)
+    cpu_ids = ["E-CPU: ", "P-CPU: "]
+    usages = [
+        round(100 * m.ecpu_usage[2], digits = 1),
+        round(100 * m.pcpu_usage[2], digits = 1),
+    ]
+    return Any[barplot(cpu_ids, usages, maximum = 100, width = 15)]
+end
+
+function TerminalSystemMonitor.plot_gpu_utilization_rates(::Type{MetalDevice})
+    sampler = Sampler()
+    msec = UInt(500)
+    m = get_metrics(sampler, msec)
+    gpu_usages = [
+        ("GPU: ", round(100 * m.gpu_usage[2], digits = 1)),
+    ]
+    plts = []
+    chip_name = String(MTLDevice(1).name)
+    push!(
+        plts, barplot(["GPU: "], [round(100 * m.gpu_usage[2], digits = 1)], xlabel=chip_name, maximum=100, width=15)
+    )
+    return plts
+end
+
+end # module TerminalSystemMonitorMacOSIOReportExt

src/TerminalSystemMonitor.jl

@@ -3,11 +3,12 @@ module TerminalSystemMonitor
 using Dates: Dates, Day, DateTime, Second
 using UnicodePlots
 import Term # this is required by UnicodePlots.panel
-using MLDataDevices: MLDataDevices, CUDADevice
+using MLDataDevices: MLDataDevices, CUDADevice, CPUDevice, MetalDevice
 
 export monitor # entrypoint from REPL
 
 # These function will be defined in Package extensions
+function plot_cpu_utilization_rates end
 function plot_gpu_utilization_rates end
 function plot_gpu_memory_utilization end
 
@@ -77,7 +78,7 @@ function extract_number_and_unit(str::AbstractString)
     end
 end
 
-function plot_cpu_utilization_rates()
+function plot_cpu_utilization_rates(::Type{CPUDevice})
     ys = get_cpu_percent()
     npad = 1 + floor(Int, log10(length(ys)))
     xs = ["id: $(lpad(i-1, npad))" for (i, _) in enumerate(ys)]
@@ -94,7 +95,7 @@ function plot_cpu_utilization_rates()
     return plts
 end
 
-function plot_cpu_memory_utilization()
+function plot_cpu_memory_utilization(::Type{CPUDevice})
     memorytotal, memorytotal_unit =
         Sys.total_memory() |> Base.format_bytes |> extract_number_and_unit
     memoryfree, _ = Sys.free_memory() |> Base.format_bytes |> extract_number_and_unit
@@ -140,42 +141,99 @@ function main(dummyargs...)
 
     while true
         try
-            plts = []
-            append!(plts, plot_cpu_utilization_rates())
             _, cols = displaysize(stdout)
-            n = max(1, cols ÷ 25)
-            chunks = collect(Iterators.partition(plts, n))
-            f = foldl(/, map(c -> prod(UnicodePlots.panel.(c)), chunks))
-
-            f /= prod(UnicodePlots.panel.(plot_cpu_memory_utilization()))
+            t1 = @async begin
+                try
+                    plts = []
+                    append!(plts, plot_cpu_utilization_rates(CPUDevice))
+                    n = max(1, cols ÷ 25)
+                    chunks = collect(Iterators.partition(plts, n))
+                    f = foldl(/, map(c -> prod(UnicodePlots.panel.(c)), chunks))
+
+                    f /= prod(UnicodePlots.panel.(plot_cpu_memory_utilization(CPUDevice)))
+                    return f
+                catch e
+                    if e isa InterruptException
+                        return nothing
+                    else
+                        rethrow(e)
+                    end
+                end
+            end
 
             if isdefined(Main, :CUDA) &&
                getproperty(getproperty(Main, :CUDA), :functional)()
+                wait(t1)
+                f = fetch(t1)
+                if isnothing(f)
+                    break
+                end
                 cudaplts = []
                 n = max(1, cols ÷ 50)
-                plts1 = plot_gpu_utilization_rates(MLDataDevices.CUDADevice)::Vector{Any}
-                plts2 = plot_gpu_memory_utilization(MLDataDevices.CUDADevice)::Vector{Any}
+                plts1 = plot_gpu_utilization_rates(CUDADevice)::Vector{Any}
+                plts2 = plot_gpu_memory_utilization(CUDADevice)::Vector{Any}
                 for i in eachindex(plts1, plts2)
                     push!(cudaplts, plts1[i])
                     push!(cudaplts, plts2[i])
                 end
                 gpuchunks = collect(Iterators.partition(cudaplts, n))
                 f /= foldl(/, map(c -> prod(UnicodePlots.panel.(c)), gpuchunks))
+            elseif isdefined(Main, :MacOSIOReport) && Sys.isapple() && Sys.ARCH == :aarch64
+                metalplts = []
+                n = max(1, cols ÷ 50)
+                t2 = @async begin
+                    try
+                        return plot_cpu_utilization_rates(MetalDevice)
+                    catch e
+                        if e isa InterruptException
+                            return nothing
+                        else
+                            rethrow(e)
+                        end
+                    end
+                end
+                t3 = @async begin
+                    try
+                        return plot_gpu_utilization_rates(MetalDevice)
+                    catch e
+                        if e isa InterruptException
+                            return nothing
+                        else
+                            rethrow(e)
+                        end
+                    end
+                end
+                wait(t1)
+                wait(t2)
+                wait(t3)
+                plts1 = fetch(t2)
+                plts2 = fetch(t3)
+                if isnothing(plts1) || isnothing(plts2)
+                    break
+                end
+                for i in eachindex(plts1)
+                    push!(metalplts, plts1[i])
+                end
+                for i in eachindex(plts2)
+                    push!(metalplts, plts2[i])
+                end
+                metalchunks = collect(Iterators.partition(metalplts, n))
+                f /= foldl(/, map(c -> prod(UnicodePlots.panel.(c)), metalchunks))
+            else
+                wait(t1)
+                f = fetch(t1)
+                if isnothing(f)
+                    break
+                end
             end
             clearlinesall()
             display(f)
         catch e
             unhidecursor() # unhide cursor
-            if e isa InterruptException
-                @info "Intrrupted"
-                break
-            else
-                @warn "Got Exception"
-                rethrow(e) # so we don't swallow true exceptions
-            end
+            @warn "Got Exception"
+            rethrow(e) # so we don't swallow true exceptions
         end
     end
-    @info "Unhide cursor"
     unhidecursor() # unhide cursor
 end