From 4cf82eb3d26020b88625256752005e737ac58dd5 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Mon, 22 Apr 2024 22:19:04 +0000 Subject: [PATCH] Update --- ci/compute-matrix.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ci/compute-matrix.py b/ci/compute-matrix.py index 7db3e92380b..8e9d2d26a3b 100755 --- a/ci/compute-matrix.py +++ b/ci/compute-matrix.py @@ -179,16 +179,18 @@ def generate_dispatch_job_name(matrix_job, job_type): cpu_str = matrix_job['cpu'] gpu_str = (', ' + matrix_job['gpu'].upper()) if job_type in matrix_yaml['gpu_required_job_types'] else "" cuda_compile_arch = (" sm{" + matrix_job['cmake_cuda_arch'] + "}") if 'cmake_cuda_arch' in matrix_job else "" - cmake_options = matrix_job['cmake_options'] if 'cmake_options' in matrix_job else "" + cmake_options = (' ' + matrix_job['cmake_options']) if 'cmake_options' in matrix_job else "" host_compiler_name = get_formatted_host_compiler_name(matrix_job['host_compiler']) host_compiler_info = f"{host_compiler_name}{matrix_job['host_compiler']['version']}" - config_tag = f"{std_str}{host_compiler_info}{cuda_compile_arch}" + config_tag = f"{std_str}{host_compiler_info}" formatted_job_type = get_formatted_job_type(job_type) - return f"[{config_tag}] {formatted_job_type}({cpu_str}{gpu_str})" + extra_info = f":{cuda_compile_arch}{cmake_options}" if cuda_compile_arch or cmake_options else "" + + return f"[{config_tag}] {formatted_job_type}({cpu_str}{gpu_str}){extra_info}" def generate_dispatch_job_runner(matrix_job, job_type): @@ -277,9 +279,6 @@ def generate_dispatch_group_jobs(matrix_job): } job_types = set(copy.deepcopy(matrix_job['job_types'])) - for job_type in job_types: - if (not job_type in matrix_yaml['all_job_types']): - raise Exception(f"Unsupported job type {job_type}") # job_types that appear in build_required_job_types: build_required = set(matrix_yaml['build_required_job_types']) & job_types