From ea2d4b05bcee2dff1b2ab972b473a2d4c3319180 Mon Sep 17 00:00:00 2001
From: Vasily Danilin <vasily.danilin@intel.com>
Date: Tue, 6 Jul 2021 20:11:24 +0300
Subject: oneAPI packages: add 2021.3 release (#24617)

---
 lib/spack/spack/compilers/oneapi.py         |  2 +-
 lib/spack/spack/test/compilers/detection.py | 45 ++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/compilers/oneapi.py b/lib/spack/spack/compilers/oneapi.py
index b4bd2bde3d..a28259c02c 100644
--- a/lib/spack/spack/compilers/oneapi.py
+++ b/lib/spack/spack/compilers/oneapi.py
@@ -29,7 +29,7 @@ class Oneapi(Compiler):
     PrgEnv_compiler = 'oneapi'
 
     version_argument = '--version'
-    version_regex = r'(?:(?:oneAPI DPC\+\+ Compiler)|(?:\(IFORT\))) (\S+)'
+    version_regex = r'(?:(?:oneAPI DPC\+\+(?:\/C\+\+)? Compiler)|(?:\(IFORT\))) (\S+)'
 
     @property
     def verbose_flag(self):
diff --git a/lib/spack/spack/test/compilers/detection.py b/lib/spack/spack/test/compilers/detection.py
index 1736f47ee5..bcc9550aae 100644
--- a/lib/spack/spack/test/compilers/detection.py
+++ b/lib/spack/spack/test/compilers/detection.py
@@ -3,27 +3,26 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 """Test detection of compiler version"""
-import pytest
 import os
 
-import llnl.util.filesystem as fs
+import pytest
 
+import llnl.util.filesystem as fs
+import spack.compilers.aocc
 import spack.compilers.arm
 import spack.compilers.cce
 import spack.compilers.clang
 import spack.compilers.fj
 import spack.compilers.gcc
 import spack.compilers.intel
-import spack.compilers.oneapi
 import spack.compilers.nag
 import spack.compilers.nvhpc
+import spack.compilers.oneapi
 import spack.compilers.pgi
 import spack.compilers.xl
 import spack.compilers.xl_r
-import spack.compilers.aocc
-
-from spack.operating_systems.cray_frontend import CrayFrontend
 import spack.util.module_cmd
+from spack.operating_systems.cray_frontend import CrayFrontend
 
 
 @pytest.mark.parametrize('version_str,expected_version', [
@@ -157,17 +156,41 @@ def test_intel_version_detection(version_str, expected_version):
 
 @pytest.mark.parametrize('version_str,expected_version', [
     (  # ICX/ICPX
-        'Intel(R) oneAPI DPC++ Compiler 2021.1 (2020.10.0.1113)\n'
+        'Intel(R) oneAPI DPC++ Compiler 2021.1.2 (2020.10.0.1214)\n'
         'Target: x86_64-unknown-linux-gnu\n'
         'Thread model: posix\n'
         'InstalledDir: /made/up/path',
-        '2021.1'
+        '2021.1.2'
+    ),
+    (  # ICX/ICPX
+        'Intel(R) oneAPI DPC++ Compiler 2021.2.0 (2021.2.0.20210317)\n'
+        'Target: x86_64-unknown-linux-gnu\n'
+        'Thread model: posix\n'
+        'InstalledDir: /made/up/path',
+        '2021.2.0'
+    ),
+    (  # ICX/ICPX
+        'Intel(R) oneAPI DPC++/C++ Compiler 2021.3.0 (2021.3.0.20210619)\n'
+        'Target: x86_64-unknown-linux-gnu\n'
+        'Thread model: posix\n'
+        'InstalledDir: /made/up/path',
+        '2021.3.0'
     ),
     (  # IFX
-        'ifx (IFORT) 2021.1 Beta 20201113\n'
+        'ifx (IFORT) 2021.1.2 Beta 20201214\n'
         'Copyright (C) 1985-2020 Intel Corporation. All rights reserved.',
-        '2021.1'
-    )
+        '2021.1.2'
+    ),
+    (  # IFX
+        'ifx (IFORT) 2021.2.0 Beta 20210317\n'
+        'Copyright (C) 1985-2020 Intel Corporation. All rights reserved.',
+        '2021.2.0'
+    ),
+    (  # IFX
+        'ifx (IFORT) 2021.3.0 Beta 20210619\n'
+        'Copyright (C) 1985-2020 Intel Corporation. All rights reserved.',
+        '2021.3.0'
+    ),
 ])
 def test_oneapi_version_detection(version_str, expected_version):
     version = spack.compilers.oneapi.Oneapi.extract_version_from_output(
-- 
cgit v1.2.3-60-g2f50