pyhw 0.14.2__tar.gz → 0.14.4__tar.gz

{pyhw-0.14.2/src/pyhw.egg-info → pyhw-0.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.14.2
+Version: 0.14.4
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>

{pyhw-0.14.2 → pyhw-0.14.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.14.2"
+version = "0.14.4"
 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.14.2 → pyhw-0.14.4}/src/pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.14.2'
+__version__ = '0.14.4'
 __author__ = 'xiaoran007'

{pyhw-0.14.2 → pyhw-0.14.4}/src/pyhw/__main__.py

@@ -154,13 +154,21 @@ def main():
         multiprocessing.Process(target=detect_os, args=(debug_info, current_os, result_dict)),
         multiprocessing.Process(target=detect_cpu, args=(debug_info, current_os, result_dict)),
         multiprocessing.Process(target=detect_memory, args=(debug_info, current_os, result_dict)),
-        multiprocessing.Process(target=detect_pci_related, args=(debug_info, current_os, result_dict)),
     ]
 
+    if current_os == "macos":
+        processes.append(multiprocessing.Process(target=detect_gpu, args=(debug_info, current_os, result_dict)))
+        processes.append(multiprocessing.Process(target=detect_nic, args=(debug_info, current_os, result_dict)))
+        processes.append(multiprocessing.Process(target=detect_npu, args=(debug_info, current_os, result_dict)))
+    else:
+        processes.append(multiprocessing.Process(target=detect_pci_related, args=(debug_info, current_os, result_dict)))
+
     start_time = time.time()
     for process in processes:
         process.start()
 
+    detection_time = time.time() - start_time
+
     for process in processes[1:]:
         process.join()
 
@@ -179,6 +187,8 @@ def main():
         for func_name, elapsed in debug_dict.items():
             detection_name = func_name.replace("detect_", "")
             print(f"{detection_name:<10}: {elapsed:.4f} s")
+        print("-" * 50)
+        print(f"Total create time: {detection_time:.4f} s")
         print("-"*50)
         print(f"Total execution time: {total_time:.4f} s")
         print("="*50)

{pyhw-0.14.2 → pyhw-0.14.4}/src/pyhw/backend/gpu/macos.py

@@ -1,5 +1,6 @@
 from .gpuInfo import GPUInfo
 from ...pyhwUtil import getArch
+from ..cpu import CPUDetect
 import json
 import subprocess
 import ctypes
@@ -19,22 +20,25 @@ class GPUDetectMacOS:
         return self.__gpuInfo
 
     def __getGPUAppleSilicon(self):
-        gpus = list()
-        try:
-            gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
-            if 'SPDisplaysDataType' in gpu_info_dict:
-                gpus = gpu_info_dict['SPDisplaysDataType']
-                self.__gpuInfo.number = len(gpus)
-            else:
-                pass
-        except Exception:
-            return
+        if self.__getGPUIOKitAppleSilicon():
+            pass
+        else:
+            gpus = list()
+            try:
+                gpu_info_dict = json.loads(subprocess.check_output(["system_profiler", "SPDisplaysDataType", "-json"]))
+                if 'SPDisplaysDataType' in gpu_info_dict:
+                    gpus = gpu_info_dict['SPDisplaysDataType']
+                    self.__gpuInfo.number = len(gpus)
+                else:
+                    pass
+            except Exception:
+                return
 
-        for gpu in gpus:
-            self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} Cores) [SOC Integrated]')
+            for gpu in gpus:
+                self.__gpuInfo.gpus.append(f'{gpu.get("sppci_model")} ({gpu.get("sppci_cores")} Cores) [SOC Integrated]')
 
     def __getGPUIntel(self):
-        if self.__getGPUIOKit():
+        if self.__getGPUIOKitIntel():
             pass
         else:  # fallback to the default implementation
             gpus = list()
@@ -56,7 +60,7 @@ class GPUDetectMacOS:
                 elif self.__handleVendor(gpu.get("spdisplays_vendor")) == "Nvidia":    # Since current macOS does not support NVIDIA GPUs, this condition is not applicable
                     pass
 
-    def __getGPUIOKit(self):
+    def __getGPUIOKitIntel(self):
         try:
             package_root = Path(__file__).resolve().parent.parent.parent
             lib = ctypes.CDLL(f"{package_root}/library/lib/iokitGPULib.dylib")
@@ -82,6 +86,22 @@ class GPUDetectMacOS:
             # print(f"An error occurred while getting GPU info using IOKit: {e}")
             return False
 
+    def __getGPUIOKitAppleSilicon(self):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/iokitGPULib.dylib")
+            lib.getAppleSiliconGPUInfo.restype = ctypes.c_char_p
+            gpu_cores = lib.getAppleSiliconGPUInfo().decode('utf-8')
+
+            if gpu_cores == "0":
+                return False
+            self.__gpuInfo.number = 1
+            self.__gpuInfo.gpus.append(f'{CPUDetect(os="macos").getCPUInfo().model} ({gpu_cores} Cores) [SOC Integrated]')
+            return True
+        except Exception as e:
+            # print(f"An error occurred while getting GPU info using IOKit: {e}")
+            return False
+
     @staticmethod
     def __handleVendor(vendor):
         if vendor == "sppci_vendor_Apple":

pyhw-0.14.4/src/pyhw/library/test/iokitGPULibTest.py

@@ -0,0 +1,17 @@
+import ctypes
+
+
+def main():
+    lib = ctypes.CDLL(f"../lib/iokitGPULib.dylib")
+    lib.getGPUInfo.restype = ctypes.c_char_p
+    lib.getAppleSiliconGPUInfo.restype = ctypes.c_char_p
+    gpu_info = lib.getAppleSiliconGPUInfo()
+    print(gpu_info.decode('utf-8'))
+
+
+if __name__ == "__main__":
+    main()
+
+
+
+

{pyhw-0.14.2 → pyhw-0.14.4/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.14.2
+Version: 0.14.4
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>

{pyhw-0.14.2 → pyhw-0.14.4}/src/pyhw.egg-info/SOURCES.txt

@@ -119,6 +119,7 @@ src/pyhw/library/lib/iokitNICLib.dylib
 src/pyhw/library/lib/nvmlGPULib_amd64.so
 src/pyhw/library/lib/nvmlGPULib_arm64.so
 src/pyhw/library/test/iokitCPULibTest.py
+src/pyhw/library/test/iokitGPULibTest.py
 src/pyhw/library/test/iokitHostLibTest.py
 src/pyhw/library/test/iokitNICLibTest.py
 src/pyhw/library/test/nvmlGPULibTest.py