From de7b57567f8aaa2e29f653d843ebf5db93a88af3 Mon Sep 17 00:00:00 2001 From: Andrey Alekseenko Date: Fri, 15 Oct 2021 09:49:07 +0000 Subject: [PATCH] Resolve "SYCL + DPCPP cmake config fails in gmxManageFFTLibraries.cmake" --- CMakeLists.txt | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d6a4b7f27..a872e26504 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,7 +209,13 @@ gmx_option_multichoice( "AUTO" AUTO None SSE2 SSE4.1 AVX_128_FMA AVX_256 AVX2_256 AVX2_128 AVX_512 AVX_512_KNL ARM_NEON_ASIMD ARM_SVE IBM_VSX Reference) -set(GMX_FFT_LIBRARY_DEFAULT "fftw3") +include(gmxTestIntelLLVM) + +if (GMX_INTEL_LLVM) + set(GMX_FFT_LIBRARY_DEFAULT "mkl") +else() + set(GMX_FFT_LIBRARY_DEFAULT "fftw3") +endif() gmx_option_multichoice( GMX_FFT_LIBRARY @@ -295,7 +301,6 @@ include(gmxManageOpenMP) # These need to be done early (before further tests). ##################################################################### -include(gmxTestIntelLLVM) include(gmxCFlags) gmx_c_flags() @@ -561,6 +566,18 @@ include(gmxManageLmfit) include(gmxManageMuparser) +################################################## +# Process SIMD instruction settings +################################################## +# This checks what flags to add in order to +# support the SIMD instructions we need, it sets +# correct defines for the SIMD instructions supported, +# and adds advanced options to control accuracy +# for SIMD math operations. +include(gmxManageSimd) +gmx_manage_simd() + + if(GMX_GPU) string(TOUPPER "${GMX_GPU}" _gmx_gpu_uppercase) @@ -687,18 +704,6 @@ if(NOT GMX_SYSTEM_XDR OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(GMX_INTERNAL_XDR 1) endif() - -################################################## -# Process SIMD instruction settings -################################################## -# This checks what flags to add in order to -# support the SIMD instructions we need, it sets -# correct defines for the SIMD instructions supported, -# and adds advanced options to control accuracy -# for SIMD math operations. -include(gmxManageSimd) -gmx_manage_simd() - ################################################## # Process FFT library settings ################################################## -- 2.22.0