benchmark_script/info.py

@@ -138,26 +138,27 @@ def _get_cpu_topology() -> CPUTopology:
         sockets = int(
             subprocess.check_output(
                 (
-                    'wmic',
-                    'computersystem',
-                    'get',
-                    'NumberOfProcessors',
-                    '/value',
+                    'powershell',
+                    '-Command',
+                    'Get-CimInstance Win32_ComputerSystem | Select-Object -ExpandProperty NumberOfProcessors'
                 ),
                 text=True,
             )
             .strip()
-            .split('=')[1]
         )
 
         cores = sum(
-            int(line.strip().split('=')[1])
-            for line in subprocess.check_output(
-                ('wmic', 'cpu', 'get', 'NumberOfCores', '/value'), text=True
+            int(core) for core in subprocess.check_output(
+                (
+                    'powershell',
+                    '-Command',
+                    'Get-CimInstance Win32_Processor | Select-Object -ExpandProperty NumberOfCores'
+                ),
+                text=True
             )
             .strip()
             .split('\n')
-            if line.strip()
+            if core
         )
 
     return CPUTopology(sockets=sockets, cores=cores, threads=multiprocessing.cpu_count())