maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix cpu_count() for incomplete PATH var on Windows and improve error handling

Browse source
This commit is contained in:
Moritz Brückner 2021-11-06 22:36:04 +01:00
parent f581e91ba9
commit 6bb2513001
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
blender/arm/utils.py
View file

@ -773,7 +773,7 @@ def export_bone_data(bobject: bpy.types.Object) -> bool:
def export_morph_targets(bobject: bpy.types.Object) -> bool: def export_morph_targets(bobject: bpy.types.Object) -> bool:
if get_rp().arm_morph_target != 'On': if get_rp().arm_morph_target != 'On':
return False return False
if not hasattr(bobject.data, 'shape_keys'): if not hasattr(bobject.data, 'shape_keys'):
return False return False
@ -1161,17 +1161,22 @@ def cpu_count(*, physical_only=False) -> Optional[int]:
if not physical_only: if not physical_only:
return os.cpu_count() return os.cpu_count()
err_reason = ''
command = []
_os = get_os() _os = get_os()
try: try:
if _os == 'win': if _os == 'win':
result = subprocess.check_output(['wmic', 'cpu', 'get', 'NumberOfCores']) command = [f'{os.environ.get("SYSTEMROOT")}\\System32\\wbem\\wmic.exe', 'cpu', 'get', 'NumberOfCores']
result = subprocess.check_output(command)
result = result.decode('utf-8').splitlines() result = result.decode('utf-8').splitlines()
result = int(result[2]) result = int(result[2])
if result > 0: if result > 0:
return result return result
elif _os == 'linux': elif _os == 'linux':
result = subprocess.check_output("grep -P '^core id' /proc/cpuinfo | sort -u | wc -l", shell=True) command = ["grep -P '^core id' /proc/cpuinfo | sort -u | wc -l"]
result = subprocess.check_output(command[0], shell=True)
result = result.decode('utf-8').splitlines() result = result.decode('utf-8').splitlines()
result = int(result[0]) result = int(result[0])
if result > 0: if result > 0:
@ -1179,12 +1184,16 @@ def cpu_count(*, physical_only=False) -> Optional[int]:
# macOS # macOS
else: else:
return int(subprocess.check_output(['sysctl', '-n', 'hw.physicalcpu'])) command = ['sysctl', '-n', 'hw.physicalcpu']
except subprocess.CalledProcessError: return int(subprocess.check_output(command))
pass
except subprocess.CalledProcessError as e:
err_reason = f'Reason: command {command} exited with code {e.returncode}.'
except FileNotFoundError as e:
err_reason = f'Reason: couldn\'t open file from command {command} ({e.errno=}).'
# Last resort even though it can be wrong # Last resort even though it can be wrong
log.warn("Could not retrieve count of physical CPUs, using logical CPU count instead.") log.warn("Could not retrieve count of physical CPUs, using logical CPU count instead.\n\t" + err_reason)
return os.cpu_count() return os.cpu_count()