Skip to content

Commit

Permalink
Merge branch 'main' into UbuntuNotSupportCUDAoldver
Browse files Browse the repository at this point in the history
  • Loading branch information
YuriiPerets authored Sep 18, 2024
2 parents 93ae536 + f3a421a commit 3327500
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 0 additions & 2 deletions src/bashi/filter_software_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ def software_dependency_filter(
f"{row[CMAKE].version}",
)
return False

# Rule: d3
# all ROCm images are Ubuntu 20.04 based or newer
# related to rule c19
Expand All @@ -118,7 +117,6 @@ def software_dependency_filter(
"older than 20.04",
)
return False

# Rule: d4
# Ubuntu 20.04 and newer is not available with CUDA older than 10.2
"""
Expand Down
2 changes: 1 addition & 1 deletion src/bashi/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ def get_expected_bashi_parameter_value_pairs(
param_val_pair_list, removed_param_val_pair_list
)
_remove_unsupported_cuda_versions_for_ubuntu(param_val_pair_list, removed_param_val_pair_list)

return (param_val_pair_list, removed_param_val_pair_list)


Expand Down Expand Up @@ -829,7 +830,6 @@ def _remove_all_rocm_images_older_than_ubuntu2004_based(
value_version2=ANY_VERSION,
)


def _remove_unsupported_cuda_versions_for_ubuntu(
parameter_value_pairs: List[ParameterValuePair],
removed_parameter_value_pairs: List[ParameterValuePair],
Expand Down
1 change: 1 addition & 0 deletions tests/test_filter_software_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,3 +424,4 @@ def test_not_valid_cuda_versions_for_ubuntu_d3(self):
reason_msg.getvalue(),
f"CUDA {CUDA_version} is not available in Ubuntu 22.04",
)

2 changes: 1 addition & 1 deletion tests/test_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -2493,7 +2493,7 @@ def test_remove_all_rocm_images_older_than_ubuntu2004_based(self):
expected_results,
create_diff_parameter_value_pairs(test_param_value_pairs, expected_results),
)

def test_remove_unsupported_cuda_versions_for_ubuntu(self):
test_param_value_pairs: List[ParameterValuePair] = parse_expected_val_pairs(
[
Expand Down

0 comments on commit 3327500

Please sign in to comment.