Skip to content

Commit

Permalink
Fixing bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@YuriiPerets
YuriiPerets committed Sep 11, 2024
1 parent 6482631 commit 1c63482
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 41 deletions.
5 changes: 5 additions & 0 deletions src/bashi/filter_compiler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ def compiler_filter(
):
reason(output, "hipcc does not support the CUDA backend.")
return False
# Rule: c19
#
if UBUNTU in row and row[UBUNTU].version < pkv.parse("20.04"):
reason(output, "hipcc does not support UBUNTU as compiler older than 20.04")
return False

if compiler in row and row[compiler].name == ICPX:
# Rule: c12
Expand Down
29 changes: 4 additions & 25 deletions src/bashi/filter_software_dependency.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,35 +105,14 @@ def software_dependency_filter(
return False
# Rule: d4
# all ROCm images are Ubuntu 20.04 based
"""
if UBUNTU in row and row[UBUNTU].version >= pkv.parse("20.04"):
for compiler_type in (HOST_COMPILER, DEVICE_COMPILER):
if compiler_type in row and row[compiler_type].name == HIPCC:
if ALPAKA_ACC_GPU_HIP_ENABLE in row and row[ALPAKA_ACC_GPU_HIP_ENABLE].version != OFF_VER:
return False
if UBUNTU in row and row[UBUNTU].version < pkv.parse("20.04"):
for compiler_type in (HOST_COMPILER, DEVICE_COMPILER):
if compiler_type in row and row[compiler_type].name == CLANG_CUDA:
return False
if UBUNTU in row and row[UBUNTU].version < pkv.parse("20.04"):
if ALPAKA_ACC_GPU_HIP_ENABLE in row and row[ALPAKA_ACC_GPU_HIP_ENABLE].version != OFF_VER:
return False
"""

if UBUNTU in row and row[UBUNTU].version < pkv.parse("20.04"):
if ALPAKA_ACC_GPU_HIP_ENABLE in row and row[ALPAKA_ACC_GPU_HIP_ENABLE].version == ON:
reason(
output,
f"ROCm images " "is not available in UBUNTU " f"{row[UBUNTU].version}",
)
return False
else:
if ALPAKA_ACC_GPU_HIP_ENABLE in row and row[ALPAKA_ACC_GPU_HIP_ENABLE].version != OFF_VER:
reason(
output,
f"ROCm images " "is not available in " f"ALPAKA_ACC_GPU_HIP_ENABLE OFF",
f"ROCm images "
"is not available in UBUNTU "
f"{__ubuntu_version_to_string(row[UBUNTU].version)}",
)
return False

return True
13 changes: 12 additions & 1 deletion src/bashi/results.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,10 +802,21 @@ def _remove_all_ROCm_images_non_Ubuntu2004_based(
remove_parameter_value_pairs(
parameter_value_pairs,
removed_parameter_value_pairs,
parameter1=UBUNTU,
value_name1=UBUNTU,
parameter1=UBUNTU,
value_version1=">=20.04",
parameter2=ALPAKA_ACC_GPU_HIP_ENABLE,
value_name2=ALPAKA_ACC_GPU_HIP_ENABLE,
value_version2=ON,
)
for compiler_type in (HOST_COMPILER, DEVICE_COMPILER):
remove_parameter_value_pairs(
parameter_value_pairs,
removed_parameter_value_pairs,
value_name1=UBUNTU,
parameter1=UBUNTU,
value_version1=">=20.04",
parameter2=compiler_type,
value_name2=HIPCC,
value_version2=ANY_VERSION,
)
43 changes: 38 additions & 5 deletions tests/test_filter_software_dependency.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,18 @@ def test_valid_ROCm_images_Ubuntu2004_based_d4(self):
)
)

for UBUNTU_version in ["16.04", "18.04", "19.04", "20.04", "22.04", "21.04"]:
self.assertTrue(
software_dependency_filter_typechecked(
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: ppv((ALPAKA_ACC_GPU_HIP_ENABLE, OFF)),
UBUNTU: ppv((UBUNTU, UBUNTU_version)),
}
),
),
)

def test_non_valid_ROCm_images_Ubuntu2004_based_d4(self):
for UBUNTU_version in ["16.04", "18.04", "19.04"]:
reason_msg = io.StringIO()
Expand All @@ -222,21 +234,42 @@ def test_non_valid_ROCm_images_Ubuntu2004_based_d4(self):
reason_msg.getvalue(),
f"ROCm images is not available in UBUNTU {UBUNTU_version}",
)
for UBUNTU_version in ["16.04", "18.04", "19.04", "20.04", "22.04", "21.04"]:

"""
for HIPCC_version in ["3.0", "4.1", "5.2"]:
reason_msg = io.StringIO()
self.assertFalse(
software_dependency_filter_typechecked(
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: ppv((ALPAKA_ACC_GPU_HIP_ENABLE, OFF)),
UBUNTU: ppv((UBUNTU, UBUNTU_version)),
HOST_COMPILER: ppv((HIPCC, HIPCC_version)),
UBUNTU: ppv((UBUNTU, "18.04")),
}
),
reason_msg,
),
f"hipcc does not support UBUNTU as compiler older than 20.04",
)
self.assertEqual(
reason_msg.getvalue(),
f"hipcc does not support UBUNTU as compiler older than 20.04",
)
for HIPCC_version in ["3.0", "4.1", "5.2"]:
reason_msg = io.StringIO()
self.assertFalse(
software_dependency_filter_typechecked(
OD(
{
DEVICE_COMPILER: ppv((HIPCC, HIPCC_version)),
UBUNTU: ppv((UBUNTU, "18.04")),
}
),
reason_msg,
),
f"ROCm images is not available in ALPAKA_ACC_GPU_HIP_ENABLE OFF",
f"hipcc does not support UBUNTU as compiler older than 20.04",
)
self.assertEqual(
reason_msg.getvalue(),
f"ROCm images is not available in ALPAKA_ACC_GPU_HIP_ENABLE OFF",
f"hipcc does not support UBUNTU as compiler older than 20.04",
)
"""
74 changes: 64 additions & 10 deletions tests/test_results.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2363,68 +2363,122 @@ def test_remove_all_ROCm_images_non_Ubuntu2004_based(self):
[
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "0.0.0"),
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, OFF),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "12"),
HOST_COMPILER: (HIPCC, "4"),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "11.2"),
HOST_COMPILER: (HIPCC, "6"),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
HOST_COMPILER: (HIPCC, "6"),
UBUNTU: (UBUNTU, "16.04"),
}
),
OD(
{
HOST_COMPILER: (HIPCC, "8"),
UBUNTU: (UBUNTU, "22.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "0.0.0"),
DEVICE_COMPILER: (HIPCC, "7"),
UBUNTU: (UBUNTU, "18.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, ON),
UBUNTU: (UBUNTU, "22.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "10.2"),
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, OFF),
UBUNTU: (UBUNTU, "22.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "0.0.0"),
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, OFF),
UBUNTU: (UBUNTU, "18.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "10.2"),
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, ON),
UBUNTU: (UBUNTU, "18.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, ON),
UBUNTU: (UBUNTU, "20.04"),
}
),
]
)
expected_results = parse_expected_val_pairs(
[
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "12"),
HOST_COMPILER: (HIPCC, "8"),
UBUNTU: (UBUNTU, "22.04"),
}
),
OD(
{
HOST_COMPILER: (HIPCC, "4"),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
HOST_COMPILER: (HIPCC, "6"),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "11.2"),
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, OFF),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, ON),
UBUNTU: (UBUNTU, "20.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, ON),
UBUNTU: (UBUNTU, "22.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, "10.2"),
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, OFF),
UBUNTU: (UBUNTU, "22.04"),
}
),
OD(
{
ALPAKA_ACC_GPU_HIP_ENABLE: (ALPAKA_ACC_GPU_HIP_ENABLE, OFF),
UBUNTU: (UBUNTU, "18.04"),
}
),
]
)
default_remove_test(
Expand Down

0 comments on commit 1c63482

Please sign in to comment.