pyhw 0.12.3__tar.gz → 0.12.5__tar.gz

{pyhw-0.12.3/src/pyhw.egg-info → pyhw-0.12.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.12.3
+Version: 0.12.5
 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>
@@ -33,7 +33,7 @@ Dynamic: license-file
 ![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
-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, FreeBSD and Windows are supported.**
+PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python.
 
 This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 

{pyhw-0.12.3 → pyhw-0.12.5}/README.md

@@ -14,7 +14,7 @@
 ![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
-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, FreeBSD and Windows are supported.**
+PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python.
 
 This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 

{pyhw-0.12.3 → pyhw-0.12.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.12.3"
+version = "0.12.5"
 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 = [
@@ -33,7 +33,7 @@ package-dir = {"" = "src"}
 include-package-data = true
 
 [tool.setuptools.package-data]
-"pyhw" = ["frontend/logo/ascii/*.pyhw", "library/lib/*.dylib"]
+"pyhw" = ["frontend/logo/ascii/*.pyhw", "library/lib/*.dylib", "library/lib/*.so"]
 
 [project.scripts]
 pyhw = "pyhw.__main__:main"

{pyhw-0.12.3 → pyhw-0.12.5}/src/pyhw/__init__.py

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

{pyhw-0.12.3 → pyhw-0.12.5}/src/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-0.12.5/src/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-0.12.3 → pyhw-0.12.5}/src/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 → pyhw-0.12.5/src/pyhw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.12.3
+Version: 0.12.5
 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>
@@ -33,7 +33,7 @@ Dynamic: license-file
 ![Static Badge](https://img.shields.io/badge/riscv64-%238A2BE2)
 
 
-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, FreeBSD and Windows are supported.**
+PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python.
 
 This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔).
 

{pyhw-0.12.3 → pyhw-0.12.5}/src/pyhw.egg-info/SOURCES.txt

@@ -112,9 +112,13 @@ src/pyhw/frontend/logo/ascii/windows_10.pyhw
 src/pyhw/frontend/logo/ascii/windows_11.pyhw
 src/pyhw/frontend/logo/ascii/windows_2025.pyhw
 src/pyhw/frontend/logo/ascii/windows_old.pyhw
+src/pyhw/library/lib/iokitCPULib.dylib
 src/pyhw/library/lib/iokitGPULib.dylib
 src/pyhw/library/lib/iokitHostLib.dylib
+src/pyhw/library/lib/nvmlGPULib_amd64.so
+src/pyhw/library/lib/nvmlGPULib_arm64.so
 src/pyhw/library/test/iokitHostLibTest.py
+src/pyhw/library/test/nvmlGPULibTest.py
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py