Merge remote-tracking branch 'origin/master' into doc-tweak (3f153536) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -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,8 +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(TOUPPER ${INTEL_ARCH} INTEL_ARCH)

		if(INTEL_ARCH STREQUAL "knl")
		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})