From 2137668c359201155be02be944a1c33206d0ee8d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 15 Aug 2018 16:26:54 -0600 Subject: [PATCH 1/3] cmake: convert FFT and INTEL_ARCH --- cmake/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 12a496cc9f..9d816afa95 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -251,6 +251,7 @@ if(PKG_KSPACE) set(FFT_VALUES KISS ${FFTW} MKL) set_property(CACHE FFT PROPERTY STRINGS ${FFT_VALUES}) validate_option(FFT FFT_VALUES) + string(TOUPPER ${FFT} FFT) if(NOT FFT STREQUAL "KISS") find_package(${FFT} REQUIRED) if(NOT FFT STREQUAL "FFTW3F") @@ -790,6 +791,7 @@ if(PKG_USER-INTEL) set(INTEL_ARCH_VALUES cpu knl) set_property(CACHE INTEL_ARCH PROPERTY STRINGS ${INTEL_ARCH_VALUES}) validate_option(INTEL_ARCH INTEL_ARCH_VALUES) + string(TOLOWER ${INTEL_ARCH} INTEL_ARCH) if(INTEL_ARCH STREQUAL "knl") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -xHost -qopenmp -qoffload") From 71227cb3c6f7b96b0b0ee2549b2d17649cf4eab4 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 15 Aug 2018 18:06:41 -0600 Subject: [PATCH 2/3] cmake: convert INTEL_ARCH to upper --- cmake/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9d816afa95..fd06070ebf 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -791,9 +791,9 @@ if(PKG_USER-INTEL) set(INTEL_ARCH_VALUES cpu knl) set_property(CACHE INTEL_ARCH PROPERTY STRINGS ${INTEL_ARCH_VALUES}) validate_option(INTEL_ARCH INTEL_ARCH_VALUES) - string(TOLOWER ${INTEL_ARCH} INTEL_ARCH) + string(TOUPPER ${INTEL_ARCH} INTEL_ARCH) - if(INTEL_ARCH STREQUAL "knl") + if(INTEL_ARCH STREQUAL "CPU") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -xHost -qopenmp -qoffload") set(MIC_OPTIONS "-qoffload-option,mic,compiler,\"-fp-model fast=2 -mGLOB_default_function_attrs=\\\"gather_scatter_loop_unroll=4\\\"\"") add_compile_options(-xMIC-AVX512 -qoffload -fno-alias -ansi-alias -restrict -qoverride-limits ${MIC_OPTIONS}) From 481924fccc1f4610b1edc156eb341cd98bfda4d9 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 16 Aug 2018 05:50:10 -0600 Subject: [PATCH 3/3] Update CMakeLists.txt --- cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index fd06070ebf..68091e4ba7 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -793,7 +793,7 @@ if(PKG_USER-INTEL) validate_option(INTEL_ARCH INTEL_ARCH_VALUES) string(TOUPPER ${INTEL_ARCH} INTEL_ARCH) - if(INTEL_ARCH STREQUAL "CPU") + if(INTEL_ARCH STREQUAL "KNL") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -xHost -qopenmp -qoffload") set(MIC_OPTIONS "-qoffload-option,mic,compiler,\"-fp-model fast=2 -mGLOB_default_function_attrs=\\\"gather_scatter_loop_unroll=4\\\"\"") add_compile_options(-xMIC-AVX512 -qoffload -fno-alias -ansi-alias -restrict -qoverride-limits ${MIC_OPTIONS})