Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
alliepiper committed Apr 22, 2024
1 parent 4d7fdb4 commit 4cf82eb
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions ci/compute-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4cf82eb

Please sign in to comment.