From a2d7fd1b37e03acba221c82212e022c7bf99987c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 10 Aug 2018 10:43:29 +0200 Subject: [PATCH] Wrap GPU names into multiple lines --- benchmark/space/__init__.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/benchmark/space/__init__.py b/benchmark/space/__init__.py index 6b252e9..388bb67 100644 --- a/benchmark/space/__init__.py +++ b/benchmark/space/__init__.py @@ -351,13 +351,19 @@ def correct_device_name(name): return "AMD " + name; return name -def construct_gpu_string(system_info): +def get_gpu_names(system_info): gpu_names = [] for device in system_info["devices"]: if device["type"] == "CPU": continue gpu_names.append(correct_device_name(device["name"])) - return ", " . join(gpu_names) + return gpu_names + +def indent_gpu_names(gpu_names): + indented_names = [] + for name in gpu_names: + indented_names.append("- " + name) + return indented_names def construct_platform_string(system_info): """ @@ -368,9 +374,13 @@ def construct_platform_string(system_info): system_info["bitness"]) result += "\nCPU: {}" . format( string_strip_trademark(system_info["cpu_brand"])) - gpus = construct_gpu_string(system_info) - if gpus: - result += "\nGPU(s): {}" . format(gpus) + gpu_names = get_gpu_names(system_info) + num_gpus = len(gpu_names) + if num_gpus: + if num_gpus == 1: + result += "\nGPU: {}" . format(gpu_names[0]) + else: + result += "\nGPUs:\n{}" . format("\n" . join(indent_gpu_names(gpu_names))) return result def convert_result_to_json_dict(ctx, results):