From 420e093e427514d04247c7f52ea1e5d3808f26e7 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Thu, 4 May 2023 13:27:19 -0400 Subject: [PATCH] detect ifx 2023.1, add test (#37377) --- lib/spack/spack/compilers/oneapi.py | 2 +- lib/spack/spack/test/compilers/detection.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/compilers/oneapi.py b/lib/spack/spack/compilers/oneapi.py index 36fa1eca5f8..fde6fa677ae 100644 --- a/lib/spack/spack/compilers/oneapi.py +++ b/lib/spack/spack/compilers/oneapi.py @@ -34,7 +34,7 @@ class Oneapi(Compiler): PrgEnv_compiler = "oneapi" version_argument = "--version" - version_regex = r"(?:(?:oneAPI DPC\+\+(?:\/C\+\+)? Compiler)|(?:\(IFORT\))) (\S+)" + version_regex = r"(?:(?:oneAPI DPC\+\+(?:\/C\+\+)? Compiler)|(?:\(IFORT\))|(?:\(IFX\))) (\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 ef1beb12502..93741bf4c28 100644 --- a/lib/spack/spack/test/compilers/detection.py +++ b/lib/spack/spack/test/compilers/detection.py @@ -263,6 +263,11 @@ def test_intel_version_detection(version_str, expected_version): "Copyright (C) 1985-2021 Intel Corporation. All rights reserved.", "2022.0.0", ), + ( # IFX + "ifx (IFX) 2023.1.0 20230320\n" + "Copyright (C) 1985-2023 Intel Corporation. All rights reserved.", + "2023.1.0", + ), ], ) def test_oneapi_version_detection(version_str, expected_version):