Merge pull request #4032 from boegel/test_intel_toolchain_oneapi

add dedicated test for opting in to using oneAPI Intel compilers

Author: akesandgren

test/framework/toolchain.py

@@ -1376,6 +1376,67 @@ def test_intel_toolchain(self):
         for var in ['CFLAGS', 'CXXFLAGS', 'FCFLAGS', 'FFLAGS', 'F90FLAGS']:
             self.assertTrue('-openmp' in tc.get_variable(var))
 
+        # with compiler-only toolchain the $MPI* variables are not defined
+        mpi_vars = ('MPICC', 'MPICXX', 'MPIF77', 'MPIF90', 'MPIFC')
+
+        # make sure environment variables are undefined before preparing build environment
+        for var in mpi_vars:
+            if os.getenv(var):
+                del os.environ[var]
+
+        tc = self.get_toolchain('intel-compilers', version='2021.4.0')
+        tc.set_options({})
+        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')
+
+        for var in mpi_vars:
+            self.assertEqual(os.getenv(var), None)
+
+    def test_intel_toolchain_oneapi(self):
+        """Test for opt-in to oneAPI with intel toolchain"""
+
+        # for recent versions of intel toolchain, we can opt in to using the new oneAPI compilers
+        self.setup_sandbox_for_intel_fftw(self.test_prefix, imklver='2021.4.0')
+        self.modtool.prepend_module_path(self.test_prefix)
+        tc = self.get_toolchain('intel', version='2021b')
+        tc.set_options({})
+        tc.prepare()
+
+        # default remains classic compilers for now
+        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.assertEqual(os.getenv('MPICC'), 'mpiicc')
+        self.assertEqual(os.getenv('MPICXX'), 'mpiicpc')
+        self.assertEqual(os.getenv('MPIF77'), 'mpiifort')
+        self.assertEqual(os.getenv('MPIF90'), 'mpiifort')
+        self.assertEqual(os.getenv('MPIFC'), 'mpiifort')
+
+        self.modtool.purge()
+        tc = self.get_toolchain('intel', version='2021b')
+        tc.set_options({'oneapi': True})
+        tc.prepare()
+
+        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.assertEqual(os.getenv('MPICC'), 'mpiicc')
+        self.assertEqual(os.getenv('MPICXX'), 'mpiicpc')
+        self.assertEqual(os.getenv('MPIF77'), 'mpiifort')
+        self.assertEqual(os.getenv('MPIF90'), 'mpiifort')
+        self.assertEqual(os.getenv('MPIFC'), 'mpiifort')
+
     def test_toolchain_verification(self):
         """Test verification of toolchain definition."""
         tc = self.get_toolchain('foss', version='2018a')