From: Andrey Alekseenko <al42and@gmail.com>
Date: Thu, 19 Aug 2021 15:36:14 +0000 (+0300)
Subject: Revert "Add workaround for CorrelationsTest with Intel ICPX"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=5fa064d6f71edca9fa0e42a336e36f0f72ee95f3;p=alexxy%2Fgromacs.git

Revert "Add workaround for CorrelationsTest with Intel ICPX"

This reverts commit 79fa11933f.

The proper fix was introduced in f3adc2fabe (MR !1794), and
then merged into master, making the workaround from 79fa11933f (MR
!1869) obsolete.

Refs #3955.
---

diff --git a/cmake/gmxCFlags.cmake b/cmake/gmxCFlags.cmake
index 2934cacb4a..bbbcacc399 100644
--- a/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@ -377,13 +377,6 @@ macro (gmx_c_flags)
         if(GMX_INTEL_LLVM AND GMX_INTEL_LLVM_VERSION GREATER_EQUAL 202110)
             GMX_TEST_CXXFLAG(CXXFLAGS_NO_UNROLL_WARNING "-Wno-pass-failed" GMXC_CXXFLAGS)
         endif()
-        # Intel ICPX compiler since 2021.3.0 uses -ffp-contract=fast option by default.
-        # This causes issues with the CorrelationsTests ExpfitTest.EffnERREST.
-        # The root cause is the test itself, but while it's being fixed, here is a workaround.
-        # See Issue #3955. TODO: Remove once the issue is resolved (e.g., by !1794).
-        if(GMX_INTEL_LLVM AND GMX_INTEL_LLVM_VERSION GREATER_EQUAL 20210300)
-            GMX_TEST_CXXFLAG(CXXFLAGS_FFP_CONTRACT "-ffp-contract=on" GMXC_CXXFLAGS)
-        endif()
     endif()
 
     # Apple bastardized version of Clang