infrastructure/blender-devops
infrastructure/blender-devops
1
1
Fork 8
Code Pull Requests 3 Activity

Invoke wheel cleaner after the install step #13

Merged
Sergey Sharybin merged 2 commits from wheel_cleanup into main 2024-11-21 09:54:08 +01:00
Conversation 0 Commits 2 Files Changed 2 +6 -1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildbot/worker/blender/compile.py
View File

@ -533,3 +533,8 @@ def compile_install(builder: worker.blender.CodeBuilder) -> None:
builder.setup_build_environment() builder.setup_build_environment()
cmake_configure(builder) cmake_configure(builder)
cmake_build(builder, True) cmake_build(builder, True)
if builder.python_module:
wheel_cleanup_tool = builder.blender_dir / "tools" / "utils_build" / "wheel_cleanup.py"
if wheel_cleanup_tool.exists():
builder.call(("python", wheel_cleanup_tool, builder.install_dir / "bpy"))

2
buildbot/worker/configure.py
View File

@ -39,7 +39,7 @@ def disk_free_in_gb(builder: worker.utils.Builder) -> float:
def get_thread_count(thread_memory_in_GB: float) -> int: def get_thread_count(thread_memory_in_GB: float) -> int:
num_threads = psutil.cpu_count() num_threads = psutil.cpu_count() or 1
memory_in_GB = psutil.virtual_memory().total / (1024**3) memory_in_GB = psutil.virtual_memory().total / (1024**3)
return min(int(memory_in_GB / thread_memory_in_GB), num_threads) return min(int(memory_in_GB / thread_memory_in_GB), num_threads)