Skip to content

Commit

Permalink
Formatting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelVarvarin committed Nov 18, 2024
1 parent 62a58cc commit 4d914bd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 25 deletions.
17 changes: 4 additions & 13 deletions script/job_generator/alpaka_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,27 +112,18 @@ def alpaka_post_filter(row: List) -> bool:
# several bugs will be fixed in alpaka 2.0.0
if (
row_check_name(row, DEVICE_COMPILER, "==", CLANG_CUDA)
and (
row_check_version(row, DEVICE_COMPILER, "==", "18")
or row_check_version(row, DEVICE_COMPILER, "==", "19")
)
and (row_check_version(row, DEVICE_COMPILER, "==", "18") or row_check_version(row, DEVICE_COMPILER, "==", "19"))
and row_check_backend_version(row, ALPAKA_ACC_GPU_CUDA_ENABLE, "!=", OFF_VER)
):
return False

if row_check_name(row, DEVICE_COMPILER, "==", NVCC) and row_check_name(
row, HOST_COMPILER, "==", CLANG
):
if row_check_name(row, DEVICE_COMPILER, "==", NVCC) and row_check_name(row, HOST_COMPILER, "==", CLANG):
# nvcc 12.5 is the minimum requirement for host compiler Clang 18
if row_check_version(row, HOST_COMPILER, "==", "18") and row_check_version(
row, DEVICE_COMPILER, "<=", "12.5"
):
if row_check_version(row, HOST_COMPILER, "==", "18") and row_check_version(row, DEVICE_COMPILER, "<=", "12.5"):
return False

# no released nvcc version supports Clang 19 yet (latest release was CUDA 12.6)
if row_check_version(row, HOST_COMPILER, "==", "19") and row_check_version(
row, DEVICE_COMPILER, "<=", "12.6"
):
if row_check_version(row, HOST_COMPILER, "==", "19") and row_check_version(row, DEVICE_COMPILER, "<=", "12.6"):
return False

return True
16 changes: 4 additions & 12 deletions script/job_generator/job_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,15 @@ def get_args() -> argparse.Namespace:
Returns:
argparse.Namespace: The commandline arguments.
"""
parser = argparse.ArgumentParser(
description="Calculate job matrix and create GitLab CI .yml."
)
parser = argparse.ArgumentParser(description="Calculate job matrix and create GitLab CI .yml.")

parser.add_argument(
"version", type=float, help="Version number of the used CI container."
)
parser.add_argument("version", type=float, help="Version number of the used CI container.")
parser.add_argument(
"--print-combinations",
action="store_true",
help="Display combination matrix.",
)
parser.add_argument(
"--verify", action="store_true", help="Verify generated combination matrix"
)
parser.add_argument("--verify", action="store_true", help="Verify generated combination matrix")
parser.add_argument(
"-a",
"--all",
Expand Down Expand Up @@ -181,9 +175,7 @@ def get_args() -> argparse.Namespace:
if striped_line.strip().startswith(COMMIT_MESSAGE_FILTER_PREFIX):
filter_regix = striped_line[len(COMMIT_MESSAGE_FILTER_PREFIX) :].strip()
if striped_line.startswith(COMMIT_MESSAGE_REORDER_PREFIX):
reorder_regix = striped_line[
len(COMMIT_MESSAGE_REORDER_PREFIX) :
].strip()
reorder_regix = striped_line[len(COMMIT_MESSAGE_REORDER_PREFIX) :].strip()

if filter_regix:
job_matrix_yaml = filter_job_list(job_matrix_yaml, filter_regix)
Expand Down

0 comments on commit 4d914bd

Please sign in to comment.