Enhance AOCC EasyBlock to work with LLVM 16 and newer

Enhances the AOCC EasyBlock so that internal LLVM versions newer than LLVM 16 map to the correct resource dir. In addition, update the list of AOCC to LLVM versions to the most up-to-date one, helping when writing AOCC EasyConfigs. Signed-off-by: Jan André Reuter <[email protected]>
easybuilders · Sep 23, 2024 · c581677 · c581677
1 parent 5cdeaef
commit c581677
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/easybuild/easyblocks/a/aocc.py b/easybuild/easyblocks/a/aocc.py
@@ -73,6 +73,9 @@ def _aocc_guess_clang_version(self):
             '3.0.0': '12.0.0',
             '3.1.0': '12.0.0',
             '3.2.0': '13.0.0',
+            '4.0.0': '14.0.6',
+            '4.1.0': '16.0.3',
+            '4.2.0': '16.0.3',
         }
 
         if self.version in map_aocc_to_clang_ver:
@@ -138,16 +141,22 @@ def create_wrapper(wrapper_comp):
 
     def sanity_check_step(self):
         """Custom sanity check for AOCC, based on sanity check for Clang."""
+
+        # Clang v16+ only use the major version number for the resource dir
+        resdir_version = self.clangversion
+        if LooseVersion(self.clangversion) >= LooseVersion('16.0.0'):
+            resdir_version = LooseVersion(self.clangversion).version[0]
+
         shlib_ext = get_shared_lib_ext()
         custom_paths = {
             'files': [
                 'bin/clang', 'bin/clang++', 'bin/flang', 'bin/lld', 'bin/llvm-ar', 'bin/llvm-as', 'bin/llvm-config',
                 'bin/llvm-link', 'bin/llvm-nm', 'bin/llvm-symbolizer', 'bin/opt', 'bin/scan-build', 'bin/scan-view',
-                'include/clang-c/Index.h', 'include/llvm-c/Core.h', 'lib/clang/%s/include/omp.h' % self.clangversion,
-                'lib/clang/%s/include/stddef.h' % self.clangversion, 'lib/libclang.%s' % shlib_ext,
+                'include/clang-c/Index.h', 'include/llvm-c/Core.h', 'lib/clang/%s/include/omp.h' % resdir_version,
+                'lib/clang/%s/include/stddef.h' % resdir_version, 'lib/libclang.%s' % shlib_ext,
                 'lib/libomp.%s' % shlib_ext,
             ],
-            'dirs': ['include/llvm', 'lib/clang/%s/lib' % self.clangversion, 'lib32'],
+            'dirs': ['include/llvm', 'lib/clang/%s/lib' % resdir_version, 'lib32'],
         }
 
         custom_commands = [