pyhw 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

pyhw/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.0'
+__version__ = '0.7.2'

pyhw/backend/npu/macos.py

@@ -1,7 +1,8 @@
 from .npuInfo import NPUInfo
-from ...pyhwUtil import getArch
+from ...pyhwUtil import getArch, getOS
 import json
 import subprocess
+from ..cpu import CPUDetect
 
 
 class NPUDetectMacOS:
@@ -10,10 +11,12 @@ class NPUDetectMacOS:
         self.__arch = getArch()
 
     def getNPUInfo(self):
-        if self.__arch == "aarch64":
-            self.__getNPUAppleSilicon()
-        else:   # Does not consider powerPC based Macs.
-            self.__getNPUIntel()
+        self.__npuInfo.npus.append(self.__getNPUbyModelName())
+        self.__npuInfo.number += 1
+        # if self.__arch == "aarch64":
+        #     self.__getNPUAppleSilicon()
+        # else:   # Does not consider powerPC based Macs.
+        #     self.__getNPUIntel()
         return self.__npuInfo
 
     def __getNPUAppleSilicon(self):
@@ -37,3 +40,26 @@ class NPUDetectMacOS:
         else:
             return vendor
 
+    @staticmethod
+    def __getNPUbyModelName():
+        # Placeholder
+        # see https://apple.fandom.com/wiki/Neural_Engine for more details.
+        model_name = CPUDetect(os=getOS()).getCPUInfo().model
+        npu = {
+            "Apple M1": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M1 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M1 Max": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M1 Ultra": "Apple Neural Engine 32 Core [SOC Integrated]",
+            "Apple M2": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M2 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M2 Max": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M2 Ultra": "Apple Neural Engine 32 Core [SOC Integrated]",
+            "Apple M3": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M3 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M3 Max": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M4": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M4 Pro": "Apple Neural Engine 16 Core [SOC Integrated]",
+            "Apple M4 Max": "Apple Neural Engine 16 Core [SOC Integrated]"
+        }
+        return npu.get(model_name, "Not Found")
+

pyhw/pyhwUtil/pyhwUtil.py

@@ -145,9 +145,9 @@ def createDataString(data: Data):
     data_string += data_string_processor.getShell()
     data_string += data_string_processor.getCPU()
     data_string += data_string_processor.getGPU()
+    data_string += data_string_processor.getNPU()
     data_string += data_string_processor.getMemory()
     data_string += data_string_processor.getNIC()
-    data_string += data_string_processor.getNPU()
     return data_string
 
 

{pyhw-0.7.0.dist-info → pyhw-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.7.0
+Version: 0.7.2
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
@@ -13,17 +13,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pypci-ng>=0.0.8
+Requires-Dist: pypci-ng>=0.0.9
 
 # PyHw
 [![Downloads](https://static.pepy.tech/badge/pyhw)](https://pepy.tech/project/pyhw)
 ![PyPI - Version](https://img.shields.io/pypi/v/pyhw?label=version)
 
-![Static Badge](https://img.shields.io/badge/macOS-11%2B-green
-)
+![Static Badge](https://img.shields.io/badge/macOS-11%2B-green)
 ![Static Badge](https://img.shields.io/badge/Linux-blue)
 ![Static Badge](https://img.shields.io/badge/FreeBSD-red)
 
+![Static Badge](https://img.shields.io/badge/amd64-green)
+![Static Badge](https://img.shields.io/badge/arm-blue)
+
 
 PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. **Currently, this project is still in the initial stage, only Linux, macOS, and FreeBSD are supported.**
 

{pyhw-0.7.0.dist-info → pyhw-0.7.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
+pyhw/__init__.py,sha256=0eAFjnFVSWI6_301EfFzaXJIiwNScF9GpeINoCLd-XM,22
 pyhw/__main__.py,sha256=A0t0jkcwdTXd6ca7POUfm8krjCn2FQaXTIss5gNmNcI,1775
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -42,7 +42,7 @@ pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,1
 pyhw/backend/npu/__init__.py,sha256=PgLKbwpgT5vw9xpa294Zxb94McyxNXW46_vMbT2Iqyc,58
 pyhw/backend/npu/bsd.py,sha256=eKkOWZ4MBybR_KOGGcsWUpzCGgghhvuBy5VNsnEE8cI,134
 pyhw/backend/npu/linux.py,sha256=mXHSYRION3pghwk6_4vgHxjSkNxI68ksGLkFZstR0mc,1192
-pyhw/backend/npu/macos.py,sha256=mNnfvjjPQNlA-mViuhmfeb__uI1be93ZSZvv7PVD52s,1037
+pyhw/backend/npu/macos.py,sha256=c-iSmGfBWYeoh7nXuCFmPlVH6bc6sil_yRsAlabl93k,2513
 pyhw/backend/npu/npuBase.py,sha256=qiioBmHDeh2Et1F7lwmNight-2W32C0VmMtx2DIOCz4,523
 pyhw/backend/npu/npuInfo.py,sha256=82dK6XvW_XKw4O5-RfR4-qQRR7Plh8qqJLj0YDzISmU,135
 pyhw/backend/os/__init__.py,sha256=rPHQYdQK3qU6ZwwodqVoEWeqBnKffXlJyi4k3-8ViPY,53
@@ -89,11 +89,11 @@ pyhw/library/lib/iokitGPULib.dylib,sha256=DcJ0GZY79gTFckLFYtZgeKn1T0NFvdO_k_ccCa
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=diIqlNUBfuHu-2VAOJk5nipGLafnWxR3chAAOmX8QRo,250
-pyhw/pyhwUtil/pyhwUtil.py,sha256=X8m49FHR56QLmkF2rJodH9wtpLZWYrRs9Hc7lBD3G_s,6297
+pyhw/pyhwUtil/pyhwUtil.py,sha256=6aKYh7sEPkqrfevckJO7MGmehGwgu_QVniFjVOw4dYk,6297
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.7.0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.7.0.dist-info/METADATA,sha256=fI3DwfOv4xwuWSCuJSa_4yIb1gTGQ-VHyDA3Gq25TcM,5430
-pyhw-0.7.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pyhw-0.7.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.7.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.7.0.dist-info/RECORD,,
+pyhw-0.7.2.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.7.2.dist-info/METADATA,sha256=48oKoqP9W07NgvgrDNK7s1reQW14yp6VXaxmOpr5HuQ,5543
+pyhw-0.7.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pyhw-0.7.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.7.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.7.2.dist-info/RECORD,,