Skip to content

Conversation

@Thyre
Copy link
Collaborator

@Thyre Thyre commented Sep 19, 2025

(created using eb --new-pr)

Switched to using the LLVM version as the version identifier, so that the LLVM EasyBlock can do its work (and the LLVM toolchains later on...), unlike done in #23304.

Requires:

So far tested on a system with ROCm. Will mark as draft until proper testing is done.

…patches: ROCm-LLVM-20.0.0_remove_termio_struct.patch
@Thyre Thyre added the new label Sep 19, 2025
@Thyre Thyre added this to the 5.x milestone Sep 19, 2025
@Thyre Thyre marked this pull request as draft September 19, 2025 20:45
@Thyre Thyre added the 2025b issues & PRs related to 2025b common toolchains label Sep 19, 2025
@github-actions github-actions bot added update and removed new labels Sep 19, 2025
@github-actions
Copy link

Updated software ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb

Diff against ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb

easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb

diff --git a/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb b/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb
index 4376b2e4ec..d92f2ae0e6 100644
--- a/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb
+++ b/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb
@@ -4,7 +4,7 @@ name = 'ROCm-LLVM'
 _llvm_version = '20.0.0'
 version = _llvm_version
 _rocm_version = '7.0.0'
-versionsuffix = f'ROCm-{_rocm_version}'
+versionsuffix = f'-ROCm-{_rocm_version}'
 
 homepage = 'https://github.com/ROCm/llvm-project'
 description = """ROCm-LLVM is an open source Clang/LLVM based compiler.
@@ -68,6 +68,7 @@ components = [
             # rename the extracted directory to the one that the LLVM easyblock expects
             'extract_cmd': 'tar xfz %%s && mv %%(name)s-rocm-%s %%(name)s-%%(version)s.src' % _rocm_version,
         }],
+        # Automatically applies to the second LLVM build as well, as sources are reused
         'patches': ['ROCm-LLVM-20.0.0_remove_termio_struct.patch'],
         'start_dir': f'llvm-project-{_llvm_version}-rocm-{_rocm_version}.src',
         'bootstrap': True,
@@ -113,7 +114,6 @@ components = [
             ' -DAOMP_STANDALONE_BUILD=0 '
             '-DAOMP_VERSION_STRING=%s ' % _rocm_version
     }),
-
 ]
 
 sanity_check_components = ['llvm-project']

Updated software ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb

Diff against ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb

easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb

diff --git a/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb b/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb
index d92f2ae0e6..4376b2e4ec 100644
--- a/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0-ROCm-7.0.0.eb
+++ b/easybuild/easyconfigs/r/ROCm-LLVM/ROCm-LLVM-20.0.0-GCCcore-14.3.0ROCm-7.0.0.eb
@@ -4,7 +4,7 @@ name = 'ROCm-LLVM'
 _llvm_version = '20.0.0'
 version = _llvm_version
 _rocm_version = '7.0.0'
-versionsuffix = f'-ROCm-{_rocm_version}'
+versionsuffix = f'ROCm-{_rocm_version}'
 
 homepage = 'https://github.com/ROCm/llvm-project'
 description = """ROCm-LLVM is an open source Clang/LLVM based compiler.
@@ -68,7 +68,6 @@ components = [
             # rename the extracted directory to the one that the LLVM easyblock expects
             'extract_cmd': 'tar xfz %%s && mv %%(name)s-rocm-%s %%(name)s-%%(version)s.src' % _rocm_version,
         }],
-        # Automatically applies to the second LLVM build as well, as sources are reused
         'patches': ['ROCm-LLVM-20.0.0_remove_termio_struct.patch'],
         'start_dir': f'llvm-project-{_llvm_version}-rocm-{_rocm_version}.src',
         'bootstrap': True,
@@ -114,6 +113,7 @@ components = [
             ' -DAOMP_STANDALONE_BUILD=0 '
             '-DAOMP_VERSION_STRING=%s ' % _rocm_version
     }),
+
 ]
 
 sanity_check_components = ['llvm-project']

@Thyre Thyre added new and removed update labels Sep 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2025b issues & PRs related to 2025b common toolchains new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant