pyhw 0.14.2__py3-none-any.whl → 0.14.3__py3-none-any.whl

pyhw/__init__.py

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

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:
+        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/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/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.dist-info → pyhw-0.14.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.14.2
+Version: 0.14.3
 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.dist-info → pyhw-0.14.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pyhw/__init__.py,sha256=YQSawzjDRCIzy8piPhOd3ggWHVeCQJ6_1EBuDzHeFAY,49
-pyhw/__main__.py,sha256=_8lT1XlZNR71daSu1IWs5befhb8wocCT4xIx2aMp-1Q,7168
+pyhw/__init__.py,sha256=uDGqf08M75C64PfWAahj4FwtgOBKhB-Je3iMKkV_bP0,49
+pyhw/__main__.py,sha256=M2WZgtqir5JBcpMbIqay4Hb08-Ncl1EPobzNkpgoL34,7679
 pyhw/backend/__init__.py,sha256=X1D1D28lSojDrUzUolgJvmbuctwBh_UxG3FwUeL8adA,51
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
 pyhw/backend/cpu/__init__.py,sha256=5YfANJVRwNwTRodG0ENOgusrdN592aaSnfq5ok4dKTo,56
@@ -14,7 +14,7 @@ pyhw/backend/gpu/bsd.py,sha256=ladMMIlTwb6Z1ETCLFII--lkeLCp50Wb7WFrlOXa5DQ,123
 pyhw/backend/gpu/gpuBase.py,sha256=ZPT9o7PhYpzlwign0GsCT519F9DGx-1UEMVVOM8MV_k,748
 pyhw/backend/gpu/gpuInfo.py,sha256=d_z_z5DiZAg85wP0VOBQEU0QHdaK3qFqA2Tp9Eq8-Zs,133
 pyhw/backend/gpu/linux.py,sha256=myapmOCsfjBxSmXxGt33bCIN18ko5lNDKcNWQ1Vlhcg,3149
-pyhw/backend/gpu/macos.py,sha256=s-GZk_Q7K58nSOYuOIAYLRvLafwHyQtsWrPVe3CuXac,4068
+pyhw/backend/gpu/macos.py,sha256=4OA4rhelS8v4Quy4S-NLpkZfYEk7XFr2ZRf_Sz7pPpY,4957
 pyhw/backend/gpu/windows.py,sha256=kMCQmk_NLXus45iHM9eKYOno_LPBW1GsrwUy1v5ar3Q,1206
 pyhw/backend/host/__init__.py,sha256=OmlSGjg3crlFcGz2FhBDyd35R7H0rriy3eq57y8h0_s,59
 pyhw/backend/host/bsd.py,sha256=xePlHfVYv7PSWMU1a7mTbMK3mzl2ssttkI13Xi5s00w,381
@@ -104,12 +104,13 @@ pyhw/frontend/logo/ascii/windows_11.pyhw,sha256=VuQTzbBabaEQhm2JBVhy6Ja6lClUGacQ
 pyhw/frontend/logo/ascii/windows_2025.pyhw,sha256=o8eWsiyhNpDoEjiWFiBMfkd-8MdIslGc1Jpm85LU4P8,643
 pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo9qLY_VRKrciY,580
 pyhw/library/lib/iokitCPULib.dylib,sha256=uMDDaijZGvTNkdT0ccQ55SDO4rRrzj8GSbrDMKeLAZ0,34280
-pyhw/library/lib/iokitGPULib.dylib,sha256=6xigd40YGEz9lHUfq_6qpTswz2st-4I9bW6j8ssg29s,155224
+pyhw/library/lib/iokitGPULib.dylib,sha256=uiULOcAPpwOG7LZGR8Sdmjh_p5QjKN1OBBCfDMnUohk,155640
 pyhw/library/lib/iokitHostLib.dylib,sha256=MKxyKUkD4IZomP4exATikWx2SxqSDqQx4FEuIkFAEnc,149912
-pyhw/library/lib/iokitNICLib.dylib,sha256=K6Bn6qAzds93S3qvjN6ClNfP_eP4GQh4BWiXa35z750,212360
+pyhw/library/lib/iokitNICLib.dylib,sha256=gOtCQFxtHnsmU9XuWUp67eOPXJw2gIBxeVLesaIb6rY,212360
 pyhw/library/lib/nvmlGPULib_amd64.so,sha256=lrkxeJjChUs8oVhaw_uMeXKbUJp24KroQ_hhcLtHfTg,12784
 pyhw/library/lib/nvmlGPULib_arm64.so,sha256=DFIYqNcuRxiZ8_jrYoaRB3Dx9GrY7UBXscwXQvV4k3I,13528
 pyhw/library/test/iokitCPULibTest.py,sha256=BrhMypgfJTeMectpDc9Tmwzp8gYwYAcowaTFf72LlLE,311
+pyhw/library/test/iokitGPULibTest.py,sha256=9Kzu6ZSnxJ5cv1JHA5N9ZUBdhjcHvC9Aes5Rf0AP7OE,305
 pyhw/library/test/iokitHostLibTest.py,sha256=oz5x1g4WMdoikU3Eo6zoxcHZ4e-UMRhXg0C0Lflo-ac,272
 pyhw/library/test/iokitNICLibTest.py,sha256=ROjfJf0ocWvRFueIyRBQ4Y0V7stlMNiAADIM3fMy7YY,2947
 pyhw/library/test/nvmlGPULibTest.py,sha256=F4AjQGZDNj29fRtxvy41zCSFi2Eirp0CQSYuxuw0n60,785
@@ -120,9 +121,9 @@ pyhw/pyhwUtil/cliUtil.py,sha256=IUcWun5nDwQb20Qe8YefS5j3Jji8a-F41Qd9QwCf0h0,2454
 pyhw/pyhwUtil/pciUtil.py,sha256=WAluDRDb-gUbqhvSIusFzPrf6r98EkrNEAwbPyMwrTc,202
 pyhw/pyhwUtil/pyhwUtil.py,sha256=V3M6X9eTirwnwwRiSJaLUWrZKZYMbRihARJVQc879P8,8364
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.14.2.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.14.2.dist-info/METADATA,sha256=r1weeDXKC898D-9W4KYZU2vIaw7RalSipTT_tcgTCog,7715
-pyhw-0.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyhw-0.14.2.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.14.2.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.14.2.dist-info/RECORD,,
+pyhw-0.14.3.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.14.3.dist-info/METADATA,sha256=0UpA2mqZLUjRxELU5nfjZZwn_rb2PCCzodnvvuKyRdI,7715
+pyhw-0.14.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyhw-0.14.3.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.14.3.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.14.3.dist-info/RECORD,,