Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AOCC easyblock to work with LLVM 16 and above #3437

Closed
wants to merge 3 commits into from
Closed

Update AOCC easyblock to work with LLVM 16 and above #3437

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c75089
Update AOCC easyblock to work with LLVM 16 and above
maxim-masterov Sep 6, 2024
df6d3f0
Update aocc.py
maxim-masterov Sep 6, 2024
86a8ae1
Update aocc.py
maxim-masterov Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions easybuild/easyblocks/a/aocc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ def __init__(self, *args, **kwargs):

self.clangversion = self.cfg['clangversion']

# Starting from LLVM v16, the folder naming is based on the major version of clang.
if LooseVersion(self.clangversion) >= LooseVersion('16.0.0'):
self.clangversion = '16'

Comment on lines +70 to +73
Copy link
Contributor

@Thyre Thyre Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break once AOCC updates to a newer Clang version. In addition, updating the clangversion to the major version only feels not correct. This is only needed for the sanity check. Therefore, such conversion should only be done where necessary.

In the Clang EasyBlock, the conversion is done during the sanity check. We should be able to mostly copy the code. I've posted a draft for AOCC in the issue for this EasyBlock (#3429 (comment)), but didn't have the time to create a PR and test it.

def _aocc_guess_clang_version(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update the list with known AOCC versions, since this simplifies writing the respective EasyConfigs

map_aocc_to_clang_ver = {
'2.3.0': '11.0.0',
Expand Down
Loading