move check for OneAPI generation of iimpi toolchain to intel-compilers toolchain component

Author: boegel

easybuild/toolchains/compiler/intel_compilers.py

@@ -28,6 +28,8 @@
 :author: Kenneth Hoste (Ghent University)
 """
 import os
+import re
+from distutils.version import LooseVersion
 
 from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort
 from easybuild.tools.toolchain.compiler import Compiler
@@ -40,6 +42,15 @@ class IntelCompilers(IntelIccIfort):
 
     COMPILER_MODULE_NAME = ['intel-compilers']
 
+    def __init__(self, *args, **kwargs):
+        """Toolchain constructor."""
+
+        super(IntelCompilers, self).__init__(*args, **kwargs)
+
+        # oneAPI generation (version 2021.x, or newer)
+        intel_comp_ver = self.get_software_version(self.COMPILER_MODULE_NAME)[0]
+        self.oneapi_gen = LooseVersion(intel_comp_ver) >= LooseVersion('2021')
+
     def _set_compiler_vars(self):
         """Intel compilers-specific adjustments after setting compiler variables."""
 

easybuild/toolchains/iimpi.py

@@ -57,51 +57,53 @@ def __init__(self, *args, **kwargs):
             # comparing subversions that include letters causes TypeErrors in Python 3
             # 'a' is assumed to be equivalent with '.01' (January), and 'b' with '.07' (June)
             # (good enough for this purpose)
-            self.iimpi_ver = LooseVersion(self.version.replace('a', '.01').replace('b', '.07'))
-            if self.iimpi_ver >= LooseVersion('2020.12'):
-                self.SUBTOOLCHAIN = IntelCompilersToolchain.NAME
-                self.COMPILER_MODULE_NAME = IntelCompilersToolchain.COMPILER_MODULE_NAME
-            else:
-                self.SUBTOOLCHAIN = IccIfort.NAME
-                self.COMPILER_MODULE_NAME = IccIfort.COMPILER_MODULE_NAME
+            self.iimpi_ver = self.version.replace('a', '.01').replace('b', '.07')
         else:
             self.iimpi_ver = self.version
 
+        if self.oneapi_gen:
+            self.SUBTOOLCHAIN = IntelCompilersToolchain.NAME
+            self.COMPILER_MODULE_NAME = IntelCompilersToolchain.COMPILER_MODULE_NAME
+        else:
+            self.SUBTOOLCHAIN = IccIfort.NAME
+            self.COMPILER_MODULE_NAME = IccIfort.COMPILER_MODULE_NAME
+
     def is_deprecated(self):
         """Return whether or not this toolchain is deprecated."""
 
         deprecated = False
 
         # make sure a non-symbolic version (e.g., 'system') is used before making comparisons using LooseVersion
         if re.match('^[0-9]', str(self.iimpi_ver)):
+            loosever = LooseVersion(self.iimpi_ver)
             # iimpi toolchains older than iimpi/2016.01 are deprecated
             # iimpi 8.1.5 is an exception, since it used in intel/2016a (which is not deprecated yet)
-            if self.iimpi_ver < LooseVersion('8.0'):
+            if loosever < LooseVersion('8.0'):
                 deprecated = True
-            elif self.iimpi_ver > LooseVersion('2000') and self.iimpi_ver < LooseVersion('2016.01'):
+            elif loosever > LooseVersion('2000') and loosever < LooseVersion('2016.01'):
                 deprecated = True
 
         return deprecated
 
     def is_dep_in_toolchain_module(self, *args, **kwargs):
         """Check whether a specific software name is listed as a dependency in the module for this toolchain."""
-        if re.match('^[0-9]', str(self.iimpi_ver)) and self.iimpi_ver < LooseVersion('2020.12'):
-            res = IccIfort.is_dep_in_toolchain_module(self, *args, **kwargs)
-        else:
+        if self.oneapi_gen:
             res = IntelCompilersToolchain.is_dep_in_toolchain_module(self, *args, **kwargs)
+        else:
+            res = IccIfort.is_dep_in_toolchain_module(self, *args, **kwargs)
 
         return res
 
     def _set_compiler_vars(self):
         """Intel compilers-specific adjustments after setting compiler variables."""
-        if re.match('^[0-9]', str(self.iimpi_ver)) and self.iimpi_ver < LooseVersion('2020.12'):
-            IccIfort._set_compiler_vars(self)
-        else:
+        if self.oneapi_gen:
             IntelCompilersToolchain._set_compiler_vars(self)
+        else:
+            IccIfort._set_compiler_vars(self)
 
     def set_variables(self):
         """Intel compilers-specific adjustments after setting compiler variables."""
-        if re.match('^[0-9]', str(self.iimpi_ver)) and self.iimpi_ver < LooseVersion('2020.12'):
-            IccIfort.set_variables(self)
-        else:
+        if self.oneapi_gen:
             IntelCompilersToolchain.set_variables(self)
+        else:
+            IccIfort.set_variables(self)