Adjustments for imkl and imkl-FFTW 2024

* determine mkl_basedir like for intel-compilers via latest symlink
* interfaces -> share/mkl/interfaces
* tools/builder -> share/mkl/tools/builder
* linux/compiler/lib/intel64_lin -> lib
* examples -> share/doc/mkl/examples

easybuild/easyblocks/generic/intelbase.py

@@ -128,6 +128,9 @@ def get_versioned_subdir(self, subdir):
             self.log.debug('Determined versioned directory for %s: %s', subdir, version)
         return self._latest_subdir[subdir]
 
+    def set_versioned_subdir(self, subdir, path):
+        self._latest_subdir[subdir] = path
+
     def get_guesses_tools(self):
         """Find reasonable paths for a subset of Intel tools, ignoring CPATH, LD_LIBRARY_PATH and LIBRARY_PATH"""
 

easybuild/easyblocks/i/imkl.py

@@ -79,14 +79,26 @@ def __init__(self, *args, **kwargs):
         self.cdftlibs = []
         self.mpi_spec = None
 
+        if self.cfg['flexiblas'] is None:
+            self.cfg['flexiblas'] = LooseVersion(self.version) >= LooseVersion('2021')
+
+        if LooseVersion(self.version) >= LooseVersion('2024'):
+            self.examples_subdir = os.path.join('share', 'doc', 'mkl', 'examples')
+            self.compiler_libdir = 'lib'
+        else:
+            self.examples_subdir = 'examples'
+            self.compiler_libdir = os.path.join('linux', 'compiler', 'lib', 'intel64_lin')
+
+    @property
+    def mkl_basedir(self):
         if LooseVersion(self.version) >= LooseVersion('2021'):
-            self.mkl_basedir = os.path.join('mkl', self.version)
-            if self.cfg['flexiblas'] is None:
-                self.cfg['flexiblas'] = True
+            return self.get_versioned_subdir('mkl')
         else:
-            self.mkl_basedir = 'mkl'
-            if self.cfg['flexiblas'] is None:
-                self.cfg['flexiblas'] = False
+            return 'mkl'
+
+    @mkl_basedir.setter
+    def mkl_basedir(self, path):
+        self.set_versioned_subdir('mkl', path)
 
     def prepare_step(self, *args, **kwargs):
         """Prepare build environment."""
@@ -162,7 +174,10 @@ def build_mkl_fftw_interfaces(self, libdir):
         loosever = LooseVersion(self.version)
 
         if loosever >= LooseVersion('10.3'):
-            intsubdir = os.path.join(self.mkl_basedir, 'interfaces')
+            intsubdir = self.mkl_basedir
+            if loosever >= LooseVersion('2024'):
+                intsubdir = os.path.join(intsubdir, 'share', 'mkl')
+            intsubdir = os.path.join(intsubdir, 'interfaces')
             inttarget = 'libintel64'
         else:
             intsubdir = 'interfaces'
@@ -306,8 +321,10 @@ def build_mkl_flexiblas(self, flexiblasdir):
         and libflexiblas_imkl_sequential.so. They can be used as FlexiBLAS backends
         via FLEXIBLAS_LIBRARY_PATH.
         """
-        builderdir = os.path.join(self.installdir, self.mkl_basedir, 'tools', 'builder')
-        change_dir(builderdir)
+        builderdir = os.path.join('tools', 'builder')
+        if LooseVersion(self.version) >= LooseVersion('2024'):
+            builderdir = os.path.join('share', 'mkl', builderdir)
+        change_dir(os.path.join(self.installdir, self.mkl_basedir, builderdir))
         mkdir(flexiblasdir, parents=True)
 
         # concatenate lists of all BLAS, CBLAS and LAPACK functions
@@ -318,8 +335,7 @@ def build_mkl_flexiblas(self, flexiblasdir):
                 with open(lst + "_example_list") as src:
                     shutil.copyfileobj(src, dst)
 
-        compilerdir = os.path.join('..', '..', '..', '..', 'compiler', self.version,
-                                   'linux', 'compiler', 'lib', 'intel64_lin')
+        compilerdir = os.path.join(self.installdir, self.get_versioned_subdir('compiler'), self.compiler_libdir)
         # IFACE_COMP_PART=gf gives the gfortran calling convention that FlexiBLAS expects
         cmds = ["make libintel64 IFACE_COMP_PART=gf export=%s name=%s" % (
             listfilename, os.path.join(flexiblasdir, 'libflexiblas_imkl_')) +
@@ -339,7 +355,7 @@ def post_install_step(self):
         super(EB_imkl, self).post_install_step()
 
         # extract examples
-        examples_subdir = os.path.join(self.installdir, self.mkl_basedir, 'examples')
+        examples_subdir = os.path.join(self.installdir, self.mkl_basedir, self.examples_subdir)
         if os.path.exists(examples_subdir):
             cwd = change_dir(examples_subdir)
             for examples_tarball in glob.glob('examples_*.tgz'):
@@ -515,7 +531,7 @@ def make_module_req_guess(self):
                 raise EasyBuildError("32-bit not supported yet for IMKL v%s (>= 10.3)", self.version)
             else:
                 if LooseVersion(self.version) >= LooseVersion('2021'):
-                    compiler_subdir = os.path.join('compiler', self.version, 'linux', 'compiler', 'lib', 'intel64_lin')
+                    compiler_subdir = os.path.join(self.get_versioned_subdir('compiler'), self.compiler_libdir)
                     pkg_config_path = [os.path.join(self.mkl_basedir, 'tools', 'pkgconfig'),
                                        os.path.join(self.mkl_basedir, 'lib', 'pkgconfig')]
                 else:
@@ -580,16 +596,12 @@ def make_module_extra(self):
 
         if 'MKL_EXAMPLES' not in self.cfg['modextravars']:
             self.cfg.update('modextravars', {
-                'MKL_EXAMPLES': os.path.join(self.installdir, self.mkl_basedir, 'examples'),
+                'MKL_EXAMPLES': os.path.join(self.installdir, self.mkl_basedir, self.examples_subdir),
             })
 
         txt = super(EB_imkl, self).make_module_extra()
 
-        if LooseVersion(self.version) >= LooseVersion('2021'):
-            mklroot = os.path.join(self.installdir, 'mkl', self.version)
-        else:
-            mklroot = os.path.join(self.installdir, 'mkl')
-
+        mklroot = os.path.join(self.installdir, self.mkl_basedir)
         txt += self.module_generator.set_environment('MKLROOT', mklroot)
 
         return txt