macpm 0.22__tar.gz → 0.24__tar.gz

macpm-0.24/PKG-INFO

@@ -0,0 +1,118 @@
+Metadata-Version: 2.1
+Name: macpm
+Version: 0.24
+Summary: Performance monitoring CLI tool for Apple Silicon
+Home-page: https://github.com/visualcjy/macpm
+Author: Jinyu Chen
+Author-email: visualcjy@mail.com
+License: MIT
+Keywords: macpm
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: MacOS
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dashing
+Requires-Dist: psutil
+Requires-Dist: humanize
+
+# macpm
+
+PyPI - Downloads (https://pypi.org/project/macpm/#files)
+or: pip install macpm
+
+enhanced MAC Performance monitoring CLI tool for Apple Silicon
+
+![](images/macpm-v.gif)
+![](images/macpm.gif)
+```shell
+pip install macpm
+```
+
+## What is `macpm`
+
+forked form https://github.com/tlkh/asitop
+1. fixed the problem that "E-CPU Usage" and "P-CPU Usage" always 100%
+2. add "Disk IO" and "Network IO" info
+3. adjust the hard coded max power in CPU/GPU/ANE
+4. change the way to call powermetrics, no temp files in /tmp 
+5. press ESC or q to quit
+6. press LEFT or RIGHT to switch color, press 1 : default view, 2 : show_core view
+7. fix M1 has no "down_ratio" tag problem, fix p-core cpu usage
+   press ctrl + r to reset the max and peak record
+
+A Python-based `nvtop`-inspired command line tool for Apple Silicon (aka M1) Macs.
+
+* Utilization info:
+  * CPU (E-cluster and P-cluster), GPU
+  * Frequency and utilization
+  * ANE utilization (measured by power)
+* Memory info:
+  * RAM and swap, size and usage
+  * (Apple removed memory bandwidth from `powermetrics`)
+* Power info:
+  * CPU power, GPU power (Apple removed package power from `powermetrics`)
+  * Chart for CPU/GPU power
+  * Peak power, rolling average display
+
+`macpm` uses the built-in [`powermetrics`](https://www.unix.com/man-page/osx/1/powermetrics/) utility on macOS, which allows access to a variety of hardware performance counters. Note that it requires `sudo` to run due to `powermetrics` needing root access to run. `macpm` is lightweight and has minimal performance impact.
+
+**`macpm` only works on Apple Silicon Macs on macOS Monterey!**
+
+## Installation and Usage
+
+`macpm` is a Python-based command line tool. You need `pip` to download and install `macpm`. macOS already comes with Python, to install `pip`, you can follow an [online guide](https://phoenixnap.com/kb/install-pip-mac). After you install `macpm` via `pip`, you can use it via the Terminal.
+
+```shell
+# to enter password before start
+# this mode is recommended!
+sudo macpm
+
+# it will prompt password on start
+macpm
+
+# advanced options
+macpm [-h] [--interval INTERVAL] [--color COLOR] [--avg AVG]
+optional arguments:
+  -h, --help           show this help message and exit
+  --interval INTERVAL  Display interval and sampling interval for powermetrics (seconds)
+  --color COLOR        Choose display color (0~8)
+  --avg AVG            Interval for averaged values (seconds)
+```
+
+## How it works
+
+`powermetrics` is used to measure the following:
+
+* CPU/GPU utilization via active residency
+* CPU/GPU frequency
+* Package/CPU/GPU/ANE energy consumption
+* CPU/GPU/Media Total memory bandwidth via the DCS (DRAM Command Scheduler)
+
+[`psutil`](https://github.com/giampaolo/psutil) is used to measure the following:
+
+* memory and swap usage
+
+[`sysctl`](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/sysctl.3.html) is used to measure the following:
+
+* CPU name
+* CPU core counts
+
+[`system_profiler`](https://ss64.com/osx/system_profiler.html) is used to measure the following:
+
+* GPU core count
+
+Some information is guesstimate and hardcoded as there doesn't seem to be a official source for it on the system:
+
+* CPU/GPU TDP
+* CPU/GPU maximum memory bandwidth
+* ANE max power
+* Media engine max bandwidth
+
+## Why
+
+Because I didn't find something like this online. Also, just curious about stuff.
+
+## Disclaimers
+
+I did this randomly don't blame me if it fried your new MacBook or something.

{macpm-0.22 → macpm-0.24}/README.md

@@ -20,6 +20,8 @@ forked form https://github.com/tlkh/asitop
 4. change the way to call powermetrics, no temp files in /tmp 
 5. press ESC or q to quit
 6. press LEFT or RIGHT to switch color, press 1 : default view, 2 : show_core view
+7. fix M1 has no "down_ratio" tag problem, fix p-core cpu usage
+   press ctrl + r to reset the max and peak record
 
 A Python-based `nvtop`-inspired command line tool for Apple Silicon (aka M1) Macs.
 

{macpm-0.22 → macpm-0.24}/macpm/macpm.py

@@ -9,7 +9,7 @@ import psutil
 import plistlib
 import curses
 
-version = 'macpm v0.22'
+version = 'macpm v0.24'
 parser = argparse.ArgumentParser(
     description=f'{version}: Performance monitoring CLI tool for Apple Silicon')
 parser.add_argument('--interval', type=int, default=1,
@@ -253,7 +253,11 @@ def parse_cpu_metrics(powermetrics_parse):
             core = e_core if name[0] == 'E' else p_core
             core.append(cpu["cpu"])
             cpu_metric_dict[name + str(cpu["cpu"]) + "_freq_Mhz"] = int(cpu["freq_hz"] / (1e6))
-            idle_ratio = cluster["down_ratio"] + (1 - cluster["down_ratio"]) * (cpu["idle_ratio"] + cpu["down_ratio"])
+            #there  is no down_ratio in M1
+            if cluster.get("down_ratio") is None:
+                idle_ratio = cpu["idle_ratio"]
+            else:
+                idle_ratio = cluster["down_ratio"] + (1 - cluster["down_ratio"]) * (cpu["idle_ratio"] + cpu["down_ratio"])
             cpu_metric_dict[name + str(cpu["cpu"]) + "_active"] = int((1 - idle_ratio) * 100)           
             if name[0] == 'E':
                 e_total_idle_ratio += idle_ratio
@@ -312,20 +316,20 @@ def parse_gpu_metrics(powermetrics_parse):
     return gpu_metrics_dict
 
 def parse_disk_metrics(powermetrics_parse):
-    disk_metrics = powermetrics_parse["disk"]
+    disk_metrics = powermetrics_parse.get("disk",{})
     disk_metrics_dict = {
-        "read_iops": int(disk_metrics["rops_per_s"]),
-        "write_iops": int(disk_metrics["wops_per_s"]),
-        "read_Bps": int(disk_metrics["rbytes_per_s"]),
-        "write_Bps": int(disk_metrics["wbytes_per_s"]),
+        "read_iops": int(disk_metrics.get("rops_per_s",0)),
+        "write_iops": int(disk_metrics.get("wops_per_s",0)),
+        "read_Bps": int(disk_metrics.get("rbytes_per_s",0)),
+        "write_Bps": int(disk_metrics.get("wbytes_per_s",0)),
     }
     return disk_metrics_dict
 
 def parse_network_metrics(powermetrics_parse):
-    network_metrics = powermetrics_parse["network"]
+    network_metrics = powermetrics_parse.get("network",{})
     network_metrics_dict = {
-        "out_Bps": int(network_metrics["obyte_rate"]),
-        "in_Bps": int(network_metrics["ibyte_rate"]),
+        "out_Bps": int(network_metrics.get("obyte_rate",0)),
+        "in_Bps": int(network_metrics.get("ibyte_rate",0)),
     }
     return network_metrics_dict
 
@@ -901,6 +905,9 @@ def begin(stdscr):
                             view1.construct(soc_info_dict,args)
                         view = 2
                         clear_console()
+                    elif key == 0x12:
+                        #press ctrl+r to reset max and peak values
+                        view1.__init__(soc_info_dict,args)
                            
                 if view == 1 or view == 2:
                     view1.display(powermetrics_parse,args)

macpm-0.24/macpm.egg-info/PKG-INFO

@@ -0,0 +1,118 @@
+Metadata-Version: 2.1
+Name: macpm
+Version: 0.24
+Summary: Performance monitoring CLI tool for Apple Silicon
+Home-page: https://github.com/visualcjy/macpm
+Author: Jinyu Chen
+Author-email: visualcjy@mail.com
+License: MIT
+Keywords: macpm
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: MacOS
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dashing
+Requires-Dist: psutil
+Requires-Dist: humanize
+
+# macpm
+
+PyPI - Downloads (https://pypi.org/project/macpm/#files)
+or: pip install macpm
+
+enhanced MAC Performance monitoring CLI tool for Apple Silicon
+
+![](images/macpm-v.gif)
+![](images/macpm.gif)
+```shell
+pip install macpm
+```
+
+## What is `macpm`
+
+forked form https://github.com/tlkh/asitop
+1. fixed the problem that "E-CPU Usage" and "P-CPU Usage" always 100%
+2. add "Disk IO" and "Network IO" info
+3. adjust the hard coded max power in CPU/GPU/ANE
+4. change the way to call powermetrics, no temp files in /tmp 
+5. press ESC or q to quit
+6. press LEFT or RIGHT to switch color, press 1 : default view, 2 : show_core view
+7. fix M1 has no "down_ratio" tag problem, fix p-core cpu usage
+   press ctrl + r to reset the max and peak record
+
+A Python-based `nvtop`-inspired command line tool for Apple Silicon (aka M1) Macs.
+
+* Utilization info:
+  * CPU (E-cluster and P-cluster), GPU
+  * Frequency and utilization
+  * ANE utilization (measured by power)
+* Memory info:
+  * RAM and swap, size and usage
+  * (Apple removed memory bandwidth from `powermetrics`)
+* Power info:
+  * CPU power, GPU power (Apple removed package power from `powermetrics`)
+  * Chart for CPU/GPU power
+  * Peak power, rolling average display
+
+`macpm` uses the built-in [`powermetrics`](https://www.unix.com/man-page/osx/1/powermetrics/) utility on macOS, which allows access to a variety of hardware performance counters. Note that it requires `sudo` to run due to `powermetrics` needing root access to run. `macpm` is lightweight and has minimal performance impact.
+
+**`macpm` only works on Apple Silicon Macs on macOS Monterey!**
+
+## Installation and Usage
+
+`macpm` is a Python-based command line tool. You need `pip` to download and install `macpm`. macOS already comes with Python, to install `pip`, you can follow an [online guide](https://phoenixnap.com/kb/install-pip-mac). After you install `macpm` via `pip`, you can use it via the Terminal.
+
+```shell
+# to enter password before start
+# this mode is recommended!
+sudo macpm
+
+# it will prompt password on start
+macpm
+
+# advanced options
+macpm [-h] [--interval INTERVAL] [--color COLOR] [--avg AVG]
+optional arguments:
+  -h, --help           show this help message and exit
+  --interval INTERVAL  Display interval and sampling interval for powermetrics (seconds)
+  --color COLOR        Choose display color (0~8)
+  --avg AVG            Interval for averaged values (seconds)
+```
+
+## How it works
+
+`powermetrics` is used to measure the following:
+
+* CPU/GPU utilization via active residency
+* CPU/GPU frequency
+* Package/CPU/GPU/ANE energy consumption
+* CPU/GPU/Media Total memory bandwidth via the DCS (DRAM Command Scheduler)
+
+[`psutil`](https://github.com/giampaolo/psutil) is used to measure the following:
+
+* memory and swap usage
+
+[`sysctl`](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/sysctl.3.html) is used to measure the following:
+
+* CPU name
+* CPU core counts
+
+[`system_profiler`](https://ss64.com/osx/system_profiler.html) is used to measure the following:
+
+* GPU core count
+
+Some information is guesstimate and hardcoded as there doesn't seem to be a official source for it on the system:
+
+* CPU/GPU TDP
+* CPU/GPU maximum memory bandwidth
+* ANE max power
+* Media engine max bandwidth
+
+## Why
+
+Because I didn't find something like this online. Also, just curious about stuff.
+
+## Disclaimers
+
+I did this randomly don't blame me if it fried your new MacBook or something.

{macpm-0.22 → macpm-0.24}/setup.py

@@ -4,12 +4,12 @@ long_description = 'Performance monitoring CLI tool for Apple Silicon'
 
 setup(
     name='macpm',
-    version='0.22',
+    version='0.24',
     author='Jinyu Chen',
     author_email='visualcjy@mail.com',
     url='https://github.com/visualcjy/macpm',
     description='Performance monitoring CLI tool for Apple Silicon',
-    long_description=long_description,
+    long_description=open('README.md').read(),
     long_description_content_type="text/markdown",
     license='MIT',
     packages=find_packages(),
@@ -31,3 +31,9 @@ setup(
     ],
     zip_safe=False
 )
+
+release_notes_0_2_3 = """
+- ix M1 has no "down_ratio" tag problem
+- fix p-core cpu usage。
+"""
+

macpm-0.22/PKG-INFO

@@ -1,19 +0,0 @@
-Metadata-Version: 2.1
-Name: macpm
-Version: 0.22
-Summary: Performance monitoring CLI tool for Apple Silicon
-Home-page: https://github.com/visualcjy/macpm
-Author: Jinyu Chen
-Author-email: visualcjy@mail.com
-License: MIT
-Keywords: macpm
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: MacOS
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: dashing
-Requires-Dist: psutil
-Requires-Dist: humanize
-
-Performance monitoring CLI tool for Apple Silicon

macpm-0.22/macpm.egg-info/PKG-INFO

@@ -1,19 +0,0 @@
-Metadata-Version: 2.1
-Name: macpm
-Version: 0.22
-Summary: Performance monitoring CLI tool for Apple Silicon
-Home-page: https://github.com/visualcjy/macpm
-Author: Jinyu Chen
-Author-email: visualcjy@mail.com
-License: MIT
-Keywords: macpm
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: MacOS
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: dashing
-Requires-Dist: psutil
-Requires-Dist: humanize
-
-Performance monitoring CLI tool for Apple Silicon