From fdb9cf2412b6dbcdd6c57e1b7e5e64ce0743c781 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Nov 2024 12:34:37 -0700 Subject: Intel/oneapi compilers: correct version ranges for diab-disable flag (#47428) * c/c++ flags should have been modified for all 2023.x.y versions, but upper bound was too low * Fortran flags should have been modified for all 2024.x.y versions, but likewise the upper bound was too low --- lib/spack/spack/compilers/intel.py | 4 ++-- lib/spack/spack/compilers/oneapi.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index 3002ba7f6e..46e0584778 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -124,8 +124,8 @@ class Intel(Compiler): # Edge cases for Intel's oneAPI compilers when using the legacy classic compilers: # Always pass flags to disable deprecation warnings, since these warnings can # confuse tools that parse the output of compiler commands (e.g. version checks). - if self.real_version >= Version("2021") and self.real_version <= Version("2023"): + if self.real_version >= Version("2021") and self.real_version < Version("2024"): env.append_flags("SPACK_ALWAYS_CFLAGS", "-diag-disable=10441") env.append_flags("SPACK_ALWAYS_CXXFLAGS", "-diag-disable=10441") - if self.real_version >= Version("2021") and self.real_version <= Version("2024"): + if self.real_version >= Version("2021") and self.real_version < Version("2025"): env.append_flags("SPACK_ALWAYS_FFLAGS", "-diag-disable=10448") diff --git a/lib/spack/spack/compilers/oneapi.py b/lib/spack/spack/compilers/oneapi.py index c06a55f396..75cee851d7 100644 --- a/lib/spack/spack/compilers/oneapi.py +++ b/lib/spack/spack/compilers/oneapi.py @@ -155,10 +155,10 @@ class Oneapi(Compiler): # icx+icpx+ifx or icx+icpx+ifort. But to be on the safe side (some users may # want to try to swap icpx against icpc, for example), and since the Intel LLVM # compilers accept these diag-disable flags, we apply them for all compilers. - if self.real_version >= Version("2021") and self.real_version <= Version("2023"): + if self.real_version >= Version("2021") and self.real_version < Version("2024"): env.append_flags("SPACK_ALWAYS_CFLAGS", "-diag-disable=10441") env.append_flags("SPACK_ALWAYS_CXXFLAGS", "-diag-disable=10441") - if self.real_version >= Version("2021") and self.real_version <= Version("2024"): + if self.real_version >= Version("2021") and self.real_version < Version("2025"): env.append_flags("SPACK_ALWAYS_FFLAGS", "-diag-disable=10448") # 2024 release bumped the libsycl version because of an ABI -- cgit v1.2.3-70-g09d2