Skip to content

Commit

Permalink
UI tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
alliepiper committed Apr 22, 2024
1 parent d84a460 commit 0e3d94a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
17 changes: 11 additions & 6 deletions ci/compute-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,20 @@ def generate_dispatch_group_name(matrix_job):
device_compiler = matrix_job['device_compiler']
host_compiler = matrix_job['host_compiler']

if host_compiler['name'] in matrix_yaml['formatted_host_compiler_names']:
host_compiler_name = matrix_yaml['formatted_host_compiler_names'][host_compiler['name']]
else:
host_compiler_name = host_compiler['name']

compiler_info = ""
if device_compiler['name'] == 'nvcc':
compiler_info = f"nvcc {host_compiler['name']}"
compiler_info = f"nvcc {host_compiler_name}"
elif device_compiler['name'] == 'llvm':
compiler_info = f"clang-cuda-{device_compiler['version']}"
else:
compiler_info = f"{device_compiler['name']}-{device_compiler['version']} {host_compiler['name']}"
compiler_info = f"{device_compiler['name']}-{device_compiler['version']} {host_compiler_name}"

return f"{project_name} CTK{ctk} {compiler_info}"
return f"{project_name} {compiler_info} CTK{ctk}"


def generate_dispatch_job_runner_dispatch(matrix_job, job_type):
Expand All @@ -167,17 +172,17 @@ def generate_dispatch_job_name(matrix_job, job_type):

gpu_str = ""
if job_type in matrix_yaml['gpu_required_job_types']:
gpu_str = " " + matrix_job['gpu'].upper()
gpu_str = "[" + matrix_job['gpu'].upper() + "]"

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 ""
cpu_str = (" " + matrix_job['cpu']) if matrix_job['cpu'] else ""

return "{}: {}-{} C++{}{}{}{}{}".format(
formatted_job_type,
return "[{}-{} C++{}] {}{}: {}{}{}".format(
matrix_job['host_compiler']['name'],
matrix_job['host_compiler']['version'],
matrix_job['std'][0],
formatted_job_type,
gpu_str,
cuda_compile_arch,
cmake_options,
Expand Down
5 changes: 5 additions & 0 deletions ci/matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ formatted_job_types:
'test': 'Test'
'nvrtc': 'NVRTC'

formatted_host_compiler_names:
'llvm': 'clang'
'oneapi': 'intel'
'cl': 'MSVC'

# Error if tags are missing:
required_tags: &required_tags ['job_types']

Expand Down

0 comments on commit 0e3d94a

Please sign in to comment.