From 21c0f769efe35ae1f88f4c664ef1405a519bb432 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 14 Jun 2024 23:54:27 +0200 Subject: [PATCH 1/2] ensure that cpu-specific -march options are always applied to icx --- cmake/cc.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/cc.cmake b/cmake/cc.cmake index 9dce9ea35..775239e1c 100644 --- a/cmake/cc.cmake +++ b/cmake/cc.cmake @@ -6,6 +6,7 @@ include(CheckCCompilerFlag) if (${CMAKE_C_COMPILER_ID} MATCHES "IntelLLVM") set(CCOMMON_OPT "${CCOMMON_OPT} -fp-model=consistent") + set(GCC_VERSION 100) endif () if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "LSB" OR ${CMAKE_C_COMPILER_ID} MATCHES "Clang") From d25ee4d0f553229cb322c8df988d0e9a75e04999 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 14 Jun 2024 23:58:45 +0200 Subject: [PATCH 2/2] Fix detection of Intel ifx and apply -fp-model option to it --- cmake/fc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/fc.cmake b/cmake/fc.cmake index 69246385c..8798ce8b4 100644 --- a/cmake/fc.cmake +++ b/cmake/fc.cmake @@ -117,12 +117,12 @@ if (${F_COMPILER} STREQUAL "GFORTRAN" OR ${F_COMPILER} STREQUAL "F95" OR CMAKE_F endif () endif () -if (${F_COMPILER} STREQUAL "INTEL") +if (${F_COMPILER} STREQUAL "INTEL" OR CMAKE_Fortran_COMPILER_ID MATCHES "Intel") set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL") if (INTERFACE64) set(FCOMMON_OPT "${FCOMMON_OPT} -i8") endif () - set(FCOMMON_OPT "${FCOMMON_OPT} -recursive") + set(FCOMMON_OPT "${FCOMMON_OPT} -recursive -fp-model=consistent") if (USE_OPENMP) set(FCOMMON_OPT "${FCOMMON_OPT} -openmp") endif ()