Set oneapi_fortran=True by default for Intel 2024.0.0+

ifort is deprecated, so default to ifx

Author: bartoldeman

easybuild/toolchains/compiler/intel_compilers.py

@@ -48,7 +48,8 @@ class IntelCompilers(IntelIccIfort):
         'oneapi': (None, "Use oneAPI compilers icx/icpx/ifx instead of classic compilers"),
         'oneapi_c_cxx': (None, "Use oneAPI C/C++ compilers icx/icpx instead of classic Intel C/C++ compilers "
                                "(auto-enabled for Intel compilers version 2022.2.0, or newer)"),
-        'oneapi_fortran': (False, "Use oneAPI Fortran compiler ifx instead of classic Intel Fortran compiler"),
+        'oneapi_fortran': (None, "Use oneAPI Fortran compiler ifx instead of classic Intel Fortran compiler "
+                                 "(auto-enabled for Intel compilers version 2024.0.0, or newer)"),
     })
 
     def _set_compiler_vars(self):
@@ -75,6 +76,9 @@ def set_variables(self):
         # auto-enable use of oneAPI C/C++ compilers for sufficiently recent versions of Intel compilers
         comp_ver = self.get_software_version(self.COMPILER_MODULE_NAME)[0]
         if LooseVersion(comp_ver) >= LooseVersion('2022.2.0'):
+            if LooseVersion(comp_ver) >= LooseVersion('2024.0.0'):
+                if self.options.get('oneapi_fortran', None) is None:
+                    self.options['oneapi_fortran'] = True
             if self.options.get('oneapi_c_cxx', None) is None:
                 self.options['oneapi_c_cxx'] = True
 

test/framework/modules/intel-compilers/2024.0.0

@@ -0,0 +1,37 @@
+#%Module
+proc ModulesHelp { } {
+    puts stderr {
+
+Description
+===========
+Intel C, C++ & Fortran compilers (classic and oneAPI)
+
+
+More information
+================
+ - Homepage: https://software.intel.com/content/www/us/en/develop/tools/oneapi/hpc-toolkit.html
+    }
+}
+
+module-whatis {Description: Intel C, C++ & Fortran compilers (classic and oneAPI)}
+module-whatis {Homepage: https://software.intel.com/content/www/us/en/develop/tools/oneapi/hpc-toolkit.html}
+module-whatis {URL: https://software.intel.com/content/www/us/en/develop/tools/oneapi/hpc-toolkit.html}
+
+set root /tmp/intel-compilers/2024.0.0
+
+conflict intel-compilers
+
+prepend-path	CPATH		$root/tbb/2021.11/include
+prepend-path	LD_LIBRARY_PATH		$root/compiler/2024.0/linux/lib
+prepend-path	LD_LIBRARY_PATH		$root/tbb/2021.11/lib/intel64/gcc4.8
+prepend-path	LIBRARY_PATH		$root/compiler/2024.0/linux/lib
+prepend-path	LIBRARY_PATH		$root/tbb/2021.11/lib/intel64/gcc4.8
+prepend-path	MANPATH			$root/compiler/2024.0/share/man
+prepend-path	OCL_ICD_FILENAMES		$root/compiler/2024.0/lib/libintelocl.so
+prepend-path	PATH		$root/compiler/2024.0/bin
+prepend-path	TBBROOT		$root/tbb/2021.11
+setenv	EBROOTINTELMINCOMPILERS		"$root"
+setenv	EBVERSIONINTELMINCOMPILERS		"2024.0.0"
+setenv	EBDEVELINTELMINCOMPILERS		"$root/easybuild/Core-intel-compilers-2024.0.0-easybuild-devel"
+
+# Built with EasyBuild version 4.8.2

test/framework/toolchain.py

@@ -1496,6 +1496,37 @@ def test_intel_toolchain_oneapi(self):
         self.assertEqual(os.getenv('F90'), 'ifx')
         self.assertEqual(os.getenv('FC'), 'ifx')
 
+        self.modtool.purge()
+        tc = self.get_toolchain('intel-compilers', version='2024.0.0')
+        tc.prepare()
+
+        # by default (for version >= 2024.0.0): oneAPI C/C++ compiler + oneAPI Fortran compiler
+        self.assertEqual(os.getenv('CC'), 'icx')
+        self.assertEqual(os.getenv('CXX'), 'icpx')
+        self.assertEqual(os.getenv('F77'), 'ifx')
+        self.assertEqual(os.getenv('F90'), 'ifx')
+        self.assertEqual(os.getenv('FC'), 'ifx')
+
+        self.modtool.purge()
+        tc = self.get_toolchain('intel-compilers', version='2024.0.0')
+        tc.set_options({'oneapi_fortran': False})
+        tc.prepare()
+        self.assertEqual(os.getenv('CC'), 'icx')
+        self.assertEqual(os.getenv('CXX'), 'icpx')
+        self.assertEqual(os.getenv('F77'), 'ifort')
+        self.assertEqual(os.getenv('F90'), 'ifort')
+        self.assertEqual(os.getenv('FC'), 'ifort')
+
+        self.modtool.purge()
+        tc = self.get_toolchain('intel-compilers', version='2024.0.0')
+        tc.set_options({'oneapi_c_cxx': False, 'oneapi_fortran': False})
+        tc.prepare()
+        self.assertEqual(os.getenv('CC'), 'icc')
+        self.assertEqual(os.getenv('CXX'), 'icpc')
+        self.assertEqual(os.getenv('F77'), 'ifort')
+        self.assertEqual(os.getenv('F90'), 'ifort')
+        self.assertEqual(os.getenv('FC'), 'ifort')
+
         self.modtool.purge()
         tc = self.get_toolchain('intel', version='2021b')
         tc.set_options({'oneapi_c_cxx': True})