Skip to content

Commit

Permalink
Merge pull request #54 from SimeonEhrig/parse_expected_val_pairs2
Browse files Browse the repository at this point in the history 
implement parse_expected_val_pairs2()
  • Loading branch information
@SimeonEhrig
SimeonEhrig authored Oct 9, 2024
2 parents abca5d6 + 330c689 commit 883bc22
Show file tree
Hide file tree
Showing 3 changed files with 140 additions and 229 deletions.
10 changes: 10 additions & 0 deletions src/bashi/globals.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,13 @@
ANY_PARAM: Parameter = "*"
ANY_NAME: ValueName = "*"
ANY_VERSION: str = "*"

# List of all supported parameters
PARAMETERS: List[Parameter] = [
HOST_COMPILER,
DEVICE_COMPILER,
UBUNTU,
CMAKE,
BOOST,
CXX_STANDARD,
] + BACKENDS
273 changes: 45 additions & 228 deletions tests/test_results.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from utils_test import (
parse_expected_val_pairs,
create_diff_parameter_value_pairs,
parse_expected_val_pairs2,
default_remove_test,
)

Expand Down Expand Up @@ -2582,238 +2583,54 @@ def test_remove_all_rocm_images_older_than_ubuntu2004_based(self):
)

def test_remove_unsupported_cuda_versions_for_ubuntu(self):
test_param_value_pairs: List[ParameterValuePair] = parse_expected_val_pairs(
test_param_value_pairs: List[ParameterValuePair] = parse_expected_val_pairs2(
[
OD({HOST_COMPILER: (GCC, 12), UBUNTU: (UBUNTU, 22.04)}),
OD({HOST_COMPILER: (CLANG_CUDA, 14), CMAKE: (CMAKE, "3.19")}),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "22.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "22.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "12"),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "11"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "11.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "14.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "7.4"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
DEVICE_COMPILER: (NVCC, "11.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (NVCC, "12"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (NVCC, "10.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "22.04"),
DEVICE_COMPILER: (NVCC, "10"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (CLANG_CUDA, "10"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (CLANG_CUDA, "10.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
DEVICE_COMPILER: (CLANG_CUDA, "11"),
}
),
OD(
{
UBUNTU: (UBUNTU, "22.04"),
DEVICE_COMPILER: (CLANG_CUDA, "12"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (CLANG_CUDA, "13"),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
DEVICE_COMPILER: (NVCC, "10.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (NVCC, "10.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (NVCC, "11"),
}
),
((HOST_COMPILER, GCC, 12), (UBUNTU, 22.04)),
((HOST_COMPILER, CLANG_CUDA, 14), (CMAKE, "3.19")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1")),
((UBUNTU, "22.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1")),
((UBUNTU, "22.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "12")),
((UBUNTU, "18.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.2")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "11")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "11.1")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "14.1")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "7.4")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF)),
((UBUNTU, "18.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF)),
((UBUNTU, "18.04"), (DEVICE_COMPILER, NVCC, "11.2")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, NVCC, "12")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, NVCC, "10.1")),
((UBUNTU, "22.04"), (DEVICE_COMPILER, NVCC, "10")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, CLANG_CUDA, "10")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, CLANG_CUDA, "10.2")),
((UBUNTU, "18.04"), (DEVICE_COMPILER, CLANG_CUDA, "11")),
((UBUNTU, "22.04"), (DEVICE_COMPILER, CLANG_CUDA, "12")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, CLANG_CUDA, "13")),
((UBUNTU, "18.04"), (DEVICE_COMPILER, NVCC, "10.2")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, NVCC, "10.2")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, NVCC, "11")),
]
)
expected_results = parse_expected_val_pairs(

expected_results: List[ParameterValuePair] = parse_expected_val_pairs2(
[
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (NVCC, "11"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "11"),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
DEVICE_COMPILER: (CLANG_CUDA, "11"),
}
),
OD(
{
UBUNTU: (UBUNTU, "22.04"),
DEVICE_COMPILER: (CLANG_CUDA, "12"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (CLANG_CUDA, "13"),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
DEVICE_COMPILER: (NVCC, "10.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
DEVICE_COMPILER: (NVCC, "11.2"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
DEVICE_COMPILER: (NVCC, "12"),
}
),
OD(
{
UBUNTU: (UBUNTU, "22.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "12"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF),
}
),
OD(
{
UBUNTU: (UBUNTU, "18.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "14.1"),
}
),
OD(
{
UBUNTU: (UBUNTU, "20.04"),
ALPAKA_ACC_GPU_CUDA_ENABLE: (ALPAKA_ACC_GPU_CUDA_ENABLE, "11.1"),
}
),
OD({HOST_COMPILER: (GCC, 12), UBUNTU: (UBUNTU, 22.04)}),
OD({HOST_COMPILER: (CLANG_CUDA, 14), CMAKE: (CMAKE, "3.19")}),
((HOST_COMPILER, GCC, 12), (UBUNTU, 22.04)),
((HOST_COMPILER, CLANG_CUDA, 14), (CMAKE, "3.19")),
((UBUNTU, "22.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "12")),
((UBUNTU, "18.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "10.1")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "11")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "11.1")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, "14.1")),
((UBUNTU, "20.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF)),
((UBUNTU, "18.04"), (ALPAKA_ACC_GPU_CUDA_ENABLE, OFF)),
((UBUNTU, "18.04"), (DEVICE_COMPILER, NVCC, "11.2")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, NVCC, "12")),
((UBUNTU, "18.04"), (DEVICE_COMPILER, CLANG_CUDA, "11")),
((UBUNTU, "22.04"), (DEVICE_COMPILER, CLANG_CUDA, "12")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, CLANG_CUDA, "13")),
((UBUNTU, "18.04"), (DEVICE_COMPILER, NVCC, "10.2")),
((UBUNTU, "20.04"), (DEVICE_COMPILER, NVCC, "11")),
]
)
default_remove_test(
Expand Down
Loading

0 comments on commit 883bc22

Please sign in to comment.