pyhw 0.12.3__py3-none-any.whl → 0.12.4__py3-none-any.whl

pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.12.3'
+__version__ = '0.12.4'
 __author__ = 'xiaoran007'

pyhw/backend/gpu/linux.py

@@ -1,12 +1,15 @@
 from .gpuInfo import GPUInfo
 from ..cpu import CPUDetect
 from ...pyhwUtil import getArch
+from pathlib import Path
 import pypci
+import ctypes
 
 
 class GPUDetectLinux:
     def __init__(self):
         self.__gpuInfo = GPUInfo()
+        self.__arch = self.__setArch()
 
     def getGPUInfo(self):
         self.__getGPUInfo()
@@ -18,14 +21,39 @@ class GPUDetectLinux:
         if len(gpu_devices) == 0:
             self.__handleNonePciDevices()
         else:
+            core_map = dict()
             for device in gpu_devices:
+                record_cores = core_map.get(device.device_id, 0)
+                if record_cores != 0:
+                    pass
+                else:
+                    cores = self.__getGPUInfoNvidia(device)
+                    core_map[device.device_id] = cores
+            for device in gpu_devices:
+                core = core_map.get(device.device_id, 0)
+                if core == 0:
+                    core_print = ""
+                else:
+                    core_print = f"({core} Cores)"
                 if device.subsystem_device_name != "":
-                    device_name = f"{device.vendor_name} {device.device_name} ({device.subsystem_device_name})"
+                    device_name = f"{device.vendor_name} {device.device_name} [{device.subsystem_device_name}] {core_print}"
                 else:
-                    device_name = f"{device.vendor_name} {device.device_name}"
+                    device_name = f"{device.vendor_name} {device.device_name} {core_print}"
                 self.__gpuInfo.gpus.append(self.__gpuNameClean(device_name))
                 self.__gpuInfo.number += 1
 
+    def __getGPUInfoNvidia(self, device):
+        try:
+            package_root = Path(__file__).resolve().parent.parent.parent
+            lib = ctypes.CDLL(f"{package_root}/library/lib/nvmlGPULib_{self.__arch}.so")
+            lib.GetGPUCoreCountByPciBusId.argtypes = [ctypes.c_char_p]
+            lib.GetGPUCoreCountByPciBusId.restype = ctypes.c_uint
+            cores = lib.GetGPUCoreCountByPciBusId(f'00000000:{device.bus}'.encode())
+            return cores
+        except Exception as e:
+            print(f"An error occurred while getting GPU info using nvml: {e}")
+            return 0
+
     def __handleNonePciDevices(self):
         # if detector can't find any VGA/Display/3D GPUs, assume the host is a sbc device, this function is a placeholder for a more advanced method.
         if getArch() in ["aarch64", "arm32", "riscv64"]:
@@ -40,5 +68,13 @@ class GPUDetectLinux:
         gpu_name_clean = gpu_name.replace("Corporation ", "")
         return gpu_name_clean
 
+    @staticmethod
+    def __setArch():
+        arch = getArch()
+        if arch == "aarch64":
+            return "arm64"
+        elif arch == "x86_64":
+            return "amd64"
+
     def __sortGPUList(self):
         self.__gpuInfo.gpus.sort()

pyhw/library/test/nvmlGPULibTest.py

@@ -0,0 +1,25 @@
+import ctypes
+import pypci
+
+
+def main():
+    lib = ctypes.CDLL(f"../lib/nvmlGPULib_amd64.so")
+    lib.GetGPUCoreCount.argtypes = [ctypes.c_uint]
+    lib.GetGPUCoreCount.restype = ctypes.c_uint
+    cuda_cores = lib.GetGPUCoreCount(0)
+    print("CUDA Cores:", cuda_cores)
+    lib.GetGPUCoreCountByPciBusId.argtypes = [ctypes.c_char_p]
+    lib.GetGPUCoreCountByPciBusId.restype = ctypes.c_uint
+    pci_bus_id = b"00000000:99:00.0"
+    cuda_cores = lib.GetGPUCoreCountByPciBusId(pci_bus_id)
+    print("CUDA Cores by PCI Bus ID:", cuda_cores)
+
+    gpu_devices = pypci.PCI().FindAllVGA()
+    for gpu in gpu_devices:
+        print(f"id: {gpu.bus}")
+        print(f"cuda cores: {lib.GetGPUCoreCountByPciBusId(f'00000000:{gpu.bus}'.encode())}")
+        
+
+
+if __name__ == "__main__":
+    main()

pyhw/pyhwUtil/pyhwUtil.py

@@ -26,7 +26,7 @@ def getOS():
 def getArch():
     """
     Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64].
+    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64, s390x, ppc64le].
     """
     arch = platform.machine()
     if arch == "x86_64" or arch == "AMD64" or arch == "amd64":
@@ -39,6 +39,10 @@ def getArch():
         return "arm32"
     elif arch == "riscv64":
         return "riscv64"
+    elif arch == "s390x":
+        return "s390x"
+    elif arch == "ppc64le":
+        return "ppc64le"
     else:
         return "unknown"
 

{pyhw-0.12.3.dist-info → pyhw-0.12.4.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=rqguoP2zvf3in_3XmLR-vjsvUyFQ75p6mkqWU7LMTnQ,49
+pyhw/__init__.py,sha256=cLvhuwktXvGfep0EXHlrozCFkIUDtlLNuQfhDaI-qQM,49
 pyhw/__main__.py,sha256=oZpFtvSyYTM8cMsulvi51zJV0gtmw3OCQVdgoaHbtxc,4977
 pyhw/backend/__init__.py,sha256=X1D1D28lSojDrUzUolgJvmbuctwBh_UxG3FwUeL8adA,51
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -13,7 +13,7 @@ pyhw/backend/gpu/__init__.py,sha256=EpMjPvUaXt0LTNMvGmB8WgXbUB9keCxuOhu8NT3Re6o,
 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=j__kwzoNqNmuKkBKhSkwIdCpa-3jf5hW6x8mx2de2OQ,1598
+pyhw/backend/gpu/linux.py,sha256=FPWu7-8k7P1L7bw8ey9hVdpxF63O5hZg8Q4lKzaPukI,3008
 pyhw/backend/gpu/macos.py,sha256=s-GZk_Q7K58nSOYuOIAYLRvLafwHyQtsWrPVe3CuXac,4068
 pyhw/backend/gpu/windows.py,sha256=9VlObAdcOXJyFFxHKHSnFdL07xiGZHNHwn6C843TfNg,1170
 pyhw/backend/host/__init__.py,sha256=Efaj7-Oya7H8HdpZHQCLrwn-mcfPb-d6yfh4dzsE_7I,58
@@ -105,16 +105,19 @@ pyhw/frontend/logo/ascii/windows_2025.pyhw,sha256=o8eWsiyhNpDoEjiWFiBMfkd-8MdIsl
 pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo9qLY_VRKrciY,580
 pyhw/library/lib/iokitGPULib.dylib,sha256=1T6nWbzwmDwH4Tu7U2Pka_7ikjIz6xfGBBvC5ejv0SQ,154552
 pyhw/library/lib/iokitHostLib.dylib,sha256=0sdPRA-dtogsgPEgb-VN32on6oIJMT9PmRZ0whRpQE0,149256
+pyhw/library/lib/nvmlGPULib_amd64.so,sha256=lrkxeJjChUs8oVhaw_uMeXKbUJp24KroQ_hhcLtHfTg,12784
+pyhw/library/lib/nvmlGPULib_arm64.so,sha256=DFIYqNcuRxiZ8_jrYoaRB3Dx9GrY7UBXscwXQvV4k3I,13528
 pyhw/library/test/iokitHostLibTest.py,sha256=oz5x1g4WMdoikU3Eo6zoxcHZ4e-UMRhXg0C0Lflo-ac,272
+pyhw/library/test/nvmlGPULibTest.py,sha256=F4AjQGZDNj29fRtxvy41zCSFi2Eirp0CQSYuxuw0n60,785
 pyhw/pyhwException/__init__.py,sha256=juw4PdgPa-eLy0y678BQ7_Ck-BJa-P0LHyKCGePazb8,221
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
 pyhw/pyhwUtil/__init__.py,sha256=n3jWo-q-jSouXvUHMg45DOHS5xLRG64E02A9rDQb44M,323
 pyhw/pyhwUtil/cliUtil.py,sha256=_zNrhzQvrtqUp6xyZ0JTs_KyL1wvLji-nBmU65XA1aI,2342
-pyhw/pyhwUtil/pyhwUtil.py,sha256=9xiZ5_32-mR5HwiL8RUjkgGhzCWyASPsYl7D_8P0N6c,8152
+pyhw/pyhwUtil/pyhwUtil.py,sha256=_eUOHcuUqPHYuecDf0nEdF2GRuRJhW99MqYSJyZ4KUA,8270
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.12.3.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.12.3.dist-info/METADATA,sha256=fyef_RxqoED7Caog4y6rgcYbTdYwgrB_b1BA3ITc1LQ,6893
-pyhw-0.12.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pyhw-0.12.3.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.12.3.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.12.3.dist-info/RECORD,,
+pyhw-0.12.4.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.12.4.dist-info/METADATA,sha256=FW756VzCh8TiNnpFspu1ZAuCp9AMXZ1CtVT-nSXMLSI,6893
+pyhw-0.12.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pyhw-0.12.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.12.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.12.4.dist-info/RECORD,,