archive/blender-benchmark-bundle
Archived
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Change benchmark result 'stats' key to 'scenes' with different content

Browse Source 
Old:
   'stats': [
        {'scene_name': 'somescene', 'otherstat': 123}
    ]
New:
   'scenes': [
        {'name': 'somescene', stats: {'otherstat': 123}}
    ]
This commit is contained in:
Sybren A. Stüvel
2018-08-09 17:31:44 +02:00
parent bcbb2a9496
commit 3bae5244cf
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
benchmark/space/__init__.py
View File

@@ -154,7 +154,8 @@ def benchmark_draw_post_pixel(arg1, arg2):
y = 0.70 * window_height y = 0.70 * window_height
score = 0 score = 0
for stat in global_result_dict["stats"]: for name_stats in global_result_dict["scenes"]:
stat = name_stats['stats']
if stat["result"] == "OK": if stat["result"] == "OK":
score += stat["total_render_time"] score += stat["total_render_time"]
else: else:
@@ -283,7 +284,7 @@ class ProgressProviderSink:
self.current_step = step_name self.current_step = step_name
self.current_progress = 0 self.current_progress = 0
progress_lock.release() progress_lock.release()
def scene(self, scene_name): def scene(self, scene_name):
progress_lock.acquire() progress_lock.acquire()
self.current_scene = scene_name self.current_scene = scene_name
@@ -375,8 +376,8 @@ def construct_platform_string(system_info):
def convert_result_to_json_dict(ctx, results): def convert_result_to_json_dict(ctx, results):
# Convert custom classes to dictionaries for easier JSON dump. # Convert custom classes to dictionaries for easier JSON dump.
json_results = results json_results = results
stats = json_results['stats'] stats = json_results['scenes']
json_results['stats'] = [] json_results['scenes'] = []
for scene in ctx.scenes: for scene in ctx.scenes:
if scene not in stats: if scene not in stats:
continue continue
@@ -386,8 +387,8 @@ def convert_result_to_json_dict(ctx, results):
stat['result'] = 'OK' stat['result'] = 'OK'
else: else:
stat = {'result': 'CRASH'} stat = {'result': 'CRASH'}
stat["scene_name"] = scene json_results['scenes'].append({'name': scene,
json_results['stats'] .append(stat) 'stats': stat})
return json_results return json_results
@@ -462,7 +463,7 @@ def benchmark_thread(ctx):
"blender_version": system_info.getBlenderVersion(ctx), "blender_version": system_info.getBlenderVersion(ctx),
"system_info": modify_system_info(blender_system_info), "system_info": modify_system_info(blender_system_info),
"device_info": modify_device_info(blender_device_info), "device_info": modify_device_info(blender_device_info),
"stats": all_stats if all_stats else {} "scenes": all_stats if all_stats else {}
}) })
progress_lock.acquire() progress_lock.acquire()
@@ -687,15 +688,16 @@ class BENCHMARK_OT_run_base(bpy.types.Operator):
reset_global_state() reset_global_state()
else: else:
global_result_stats = "" global_result_stats = ""
for stat in global_result_dict["stats"]: for name_stat in global_result_dict["scenes"]:
stat = name_stat["stats"]
if global_result_stats: if global_result_stats:
global_result_stats += "\n" global_result_stats += "\n"
if stat["result"] == "OK": if stat["result"] == "OK":
global_result_stats += "{}: {}" . format(stat["scene_name"], global_result_stats += "{}: {}" . format(name_stat['name'],
util.humanReadableTimeDifference( util.humanReadableTimeDifference(
stat["total_render_time"])) stat["total_render_time"]))
else: else:
global_result_stats += "{}: {}" . format(stat["scene_name"], global_result_stats += "{}: {}" . format(name_stat['name'],
stat["result"]) stat["result"])
# TOGO(sergey): Use some more nice picture for the final slide. # TOGO(sergey): Use some more nice picture for the final slide.
global global_background_image_path global global_background_image_path