pyhw 0.7.0__tar.gz → 0.7.1__tar.gz

{pyhw-0.7.0/src/pyhw.egg-info → pyhw-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.7.0
+Version: 0.7.1
 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

{pyhw-0.7.0 → pyhw-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.7.0"
+version = "0.7.1"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 keywords = ["neofetch", "system information", "command line tool", "python", "hardware information", "fastfetch", "fetching"]
 authors = [

pyhw-0.7.1/src/pyhw/backend/npu/macos.py

@@ -0,0 +1,65 @@
+from .npuInfo import NPUInfo
+from ...pyhwUtil import getArch, getOS
+import json
+import subprocess
+from ..cpu import CPUDetect
+
+
+class NPUDetectMacOS:
+    def __init__(self):
+        self.__npuInfo = NPUInfo()
+        self.__arch = getArch()
+
+    def getNPUInfo(self):
+        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):
+        # Place holder
+        self.__npuInfo.npus.append("Apple Neural Engine [SOC Integrated]")
+        self.__npuInfo.number += 1
+
+    def __getNPUIntel(self):
+        # Place holder
+        self.__npuInfo.npus.append("Not Found")
+        self.__npuInfo.number += 1
+
+    @staticmethod
+    def __handleVendor(vendor):
+        if vendor == "sppci_vendor_Apple":
+            return "Apple"
+        elif vendor == "sppci_vendor_intel":
+            return "Intel"
+        elif vendor == "sppci_vendor_amd":
+            return "AMD"
+        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-0.7.0 → pyhw-0.7.1/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.7.0
+Version: 0.7.1
 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

pyhw-0.7.0/src/pyhw/backend/npu/macos.py

@@ -1,39 +0,0 @@
-from .npuInfo import NPUInfo
-from ...pyhwUtil import getArch
-import json
-import subprocess
-
-
-class NPUDetectMacOS:
-    def __init__(self):
-        self.__npuInfo = NPUInfo()
-        self.__arch = getArch()
-
-    def getNPUInfo(self):
-        if self.__arch == "aarch64":
-            self.__getNPUAppleSilicon()
-        else:   # Does not consider powerPC based Macs.
-            self.__getNPUIntel()
-        return self.__npuInfo
-
-    def __getNPUAppleSilicon(self):
-        # Place holder
-        self.__npuInfo.npus.append("Apple Neural Engine [SOC Integrated]")
-        self.__npuInfo.number += 1
-
-    def __getNPUIntel(self):
-        # Place holder
-        self.__npuInfo.npus.append("Not Found")
-        self.__npuInfo.number += 1
-
-    @staticmethod
-    def __handleVendor(vendor):
-        if vendor == "sppci_vendor_Apple":
-            return "Apple"
-        elif vendor == "sppci_vendor_intel":
-            return "Intel"
-        elif vendor == "sppci_vendor_amd":
-            return "AMD"
-        else:
-            return vendor
-

{pyhw-0.7.0 → pyhw-0.7.1}/src/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