Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-11 00:00:35 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-11 01:12:05 +0300
commit93901e7f0a05ba471f3b4c0201500d9dfcd68c2c (patch)
treedeae72a55e7aae68dd23dddc44f26b59952a64ea /tests/python/cycles_render_tests.py
parent79b9596c667934a97e6f7050fd325d03d653bb60 (diff)
Tests: speed up render tests by running multiple in the same process
Blender startup time and shader compilation is a big factor when running hundreds of tests, so now all renders in the same ctest run in the same process. If a test crashes, the remaining tests in the same category will be marked as skipped. Benchmarked on a quad core with ctest -j8. cycles: 118.1s -> 94.3s eevee: 66.2s -> 29.2s workbench: 31.7s -> 8.6s
Diffstat (limited to 'tests/python/cycles_render_tests.py')
-rwxr-xr-xtests/python/cycles_render_tests.py97
1 files changed, 48 insertions, 49 deletions
diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py
index 36f5459c2f7..a66409d85c3 100755
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -9,77 +9,76 @@ import subprocess
import sys
-def render_file(filepath, output_filepath):
- dirname = os.path.dirname(filepath)
- basedir = os.path.dirname(dirname)
- subject = os.path.basename(dirname)
-
- frame_filepath = output_filepath + '0001.png'
-
- common_args = [
- "-noaudio",
- "--factory-startup",
- "--enable-autoexec",
- filepath,
- "-E", "CYCLES",
- "-o", output_filepath,
- "-F", "PNG"]
+def render_files(filepaths, output_filepaths):
+ command = [BLENDER, "--background"]
# OSL and GPU examples
# custom_args += ["--python-expr", "import bpy; bpy.context.scene.cycles.shading_system = True"]
# custom_args += ["--python-expr", "import bpy; bpy.context.scene.cycles.device = 'GPU'"]
custom_args = os.getenv('CYCLESTEST_ARGS')
custom_args = shlex.split(custom_args) if custom_args else []
- common_args += custom_args
-
- if subject == 'opengl':
- command = [BLENDER, "--window-geometry", "0", "0", "1", "1"]
- command += common_args
- command += ['--python', os.path.join(basedir, "util", "render_opengl.py")]
- elif subject == 'bake':
- command = [BLENDER, "--background"]
- command += common_args
- command += ['--python', os.path.join(basedir, "util", "render_bake.py")]
- elif subject == 'denoise_animation':
- command = [BLENDER, "--background"]
- command += common_args
- command += ['--python', os.path.join(basedir, "util", "render_denoise.py")]
- else:
- command = [BLENDER, "--background"]
- command += common_args
- command += ["-f", "1"]
+ for filepath, output_filepath in zip(filepaths, output_filepaths):
+ dirname = os.path.dirname(filepath)
+ basedir = os.path.dirname(dirname)
+ subject = os.path.basename(dirname)
+
+ frame_filepath = output_filepath + '0001.png'
+
+ common_args = [
+ "-noaudio",
+ "--factory-startup",
+ "--enable-autoexec",
+ filepath,
+ "-E", "CYCLES",
+ "-o", output_filepath,
+ "-F", "PNG"]
+
+ common_args += custom_args
+
+ if subject == 'bake':
+ command.extend(common_args)
+ command.extend(['--python', os.path.join(basedir, "util", "render_bake.py")])
+ elif subject == 'denoise_animation':
+ command.extend(common_args)
+ command.extend(['--python', os.path.join(basedir, "util", "render_denoise.py")])
+ else:
+ command.extend(common_args)
+ command.extend(["-f", "1"])
+
+ error = None
try:
# Success
output = subprocess.check_output(command)
- if os.path.exists(frame_filepath):
- shutil.copy(frame_filepath, output_filepath)
- os.remove(frame_filepath)
if VERBOSE:
print(" ".join(command))
print(output.decode("utf-8"))
- return None
except subprocess.CalledProcessError as e:
# Error
- if os.path.exists(frame_filepath):
- os.remove(frame_filepath)
if VERBOSE:
print(" ".join(command))
print(e.output.decode("utf-8"))
- if b"Error: engine not found" in e.output:
- return "NO_ENGINE"
- elif b"blender probably wont start" in e.output:
- return "NO_START"
- return "CRASH"
+ error = "CRASH"
except BaseException as e:
# Crash
- if os.path.exists(frame_filepath):
- os.remove(frame_filepath)
if VERBOSE:
print(" ".join(command))
- print(e)
- return "CRASH"
+ print(e.decode("utf-8"))
+ error = "CRASH"
+
+ # Detect missing filepaths and consider those errors
+ errors = []
+ for output_filepath in output_filepaths:
+ frame_filepath = output_filepath + '0001.png'
+ if os.path.exists(frame_filepath):
+ shutil.copy(frame_filepath, output_filepath)
+ os.remove(frame_filepath)
+ errors.append(None)
+ else:
+ errors.append(error)
+ error = 'SKIPPED'
+ return errors
def create_argparse():
parser = argparse.ArgumentParser()
@@ -108,7 +107,7 @@ def main():
report.set_pixelated(True)
report.set_reference_dir("cycles_renders")
report.set_compare_engines('cycles', 'eevee')
- ok = report.run(test_dir, render_file)
+ ok = report.run(test_dir, render_files)
sys.exit(not ok)