Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
ff758de7
Commit
ff758de7
authored
Dec 18, 2014
by
COULAUD Olivier
Browse files
Add AVX or SSE flags in scalfmm_cxx_flags
Push scalfmm_cxx_flags in ScalFMMConfig.cmake
parent
2265be2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
ff758de7
...
...
@@ -283,12 +283,12 @@ if( ScalFMM_USE_SSE )
TRY_COMPILE
(
COMPILE_SSE
${
CMAKE_CURRENT_BINARY_DIR
}
${
CMAKE_MODULE_PATH
}
/compileTestSse.cpp COMPILE_DEFINITIONS
"
${
CMAKE_CXX_FLAGS
}
${
SSE_FLAGS
}
"
OUTPUT_VARIABLE COMPILE_SSE_OUTPUT
)
IF
(
${
COMPILE_SSE
}
)
SET
(
CMAKE
_CXX_FLAGS
"
${
CMAKE
_CXX_FLAGS
}
${
SSE_FLAGS
}
"
)
SET
(
ScaLFMM
_CXX_FLAGS
"
${
ScaLFMM
_CXX_FLAGS
}
${
SSE_FLAGS
}
"
)
TRY_COMPILE
(
COMPILE_RESULT_VAR
${
CMAKE_CURRENT_BINARY_DIR
}
${
CMAKE_MODULE_PATH
}
/checkSSEpe.cpp COMPILE_DEFINITIONS
"
${
CMAKE_CXX_FLAGS
}
${
SSE_FLAGS
}
"
)
IF
(
NOT
${
COMPILE_RESULT_VAR
}
)
SET
(
CMAKE
_CXX_FLAGS
"
${
CMAKE
_CXX_FLAGS
}
-D__SSEPE_INTEL_COMPILER"
)
SET
(
ScaLFMM
_CXX_FLAGS
"
${
ScaLFMM
_CXX_FLAGS
}
-D__SSEPE_INTEL_COMPILER"
)
ENDIF
()
# SET(ScalFMM_USE_AVX OFF)
ELSE
(
${
COMPILE_SSE
}
)
...
...
@@ -307,12 +307,12 @@ if(ScalFMM_USE_AVX)
TRY_COMPILE
(
COMPILE_AVX
${
CMAKE_CURRENT_BINARY_DIR
}
${
CMAKE_MODULE_PATH
}
/compileTestAvx.cpp COMPILE_DEFINITIONS
"
${
CMAKE_CXX_FLAGS
}
${
AVX_FLAGS
}
"
OUTPUT_VARIABLE COMPILE_AVX_OUTPUT
)
IF
(
${
COMPILE_AVX
}
)
SET
(
CMAKE
_CXX_FLAGS
"
${
CMAKE
_CXX_FLAGS
}
${
AVX_FLAGS
}
"
)
SET
(
ScaLFMM
_CXX_FLAGS
"
${
ScaLFMM
_CXX_FLAGS
}
${
AVX_FLAGS
}
"
)
# SET( ScalFMM_USE_SSE OFF FORCE) # ne marche pas
TRY_COMPILE
(
COMPILE_RESULT_AVSPE
${
CMAKE_CURRENT_BINARY_DIR
}
${
CMAKE_MODULE_PATH
}
/checkAVXpe.cpp COMPILE_DEFINITIONS
"
${
CMAKE_CXX_FLAGS
}
"
)
IF
(
NOT
${
COMPILE_RESULT_AVSPE
}
)
SET
(
CMAKE
_CXX_FLAGS
"
${
CMAKE
_CXX_FLAGS
}
-D__AVXPE_INTEL_COMPILER"
)
SET
(
ScaLFMM
_CXX_FLAGS
"
${
ScaLFMM
_CXX_FLAGS
}
-D__AVXPE_INTEL_COMPILER"
)
ENDIF
()
MESSAGE
(
STATUS
${
CMAKE_CXX_FLAGS
}
)
...
...
@@ -498,6 +498,9 @@ MESSAGE( STATUS "ScalFMM_USE_LOG = ${ScalFMM_USE_LOG}" )
# Use Assert
MESSAGE
(
STATUS
"ScalFMM_USE_ASSERT =
${
ScalFMM_USE_ASSERT
}
"
)
#
MESSAGE
(
STATUS
"CMAKE_CXX_FLAGS =
${
CMAKE_CXX_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS
"
${
ScaLFMM_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS
}
"
)
MESSAGE
(
STATUS
"CMAKE_CXX_FLAGS =
${
CMAKE_CXX_FLAGS
}
"
)
MESSAGE
(
STATUS
"ScaLFMM_CXX_FLAGS =
${
ScaLFMM_CXX_FLAGS
}
"
)
MESSAGE
(
STATUS
"SCALFMM_LIBRARIES =
${
SCALFMM_LIBRARIES
}
"
)
...
...
ScalFMMConfig.cmake.in
View file @
ff758de7
...
...
@@ -16,6 +16,7 @@ SET(ScalFMM_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include")
SET(ScalFMM_LIBRARIES_DIR "@CMAKE_INSTALL_PREFIX@/lib")
SET(ScalFMM_LIBRARIES_ADD "@SCALFMM_LIBRARIES@")
SET(ScalFMM_LIBRARY_NAME "@scalfmm_lib@")
SET(ScaLFMM_CXX_FLAGS "@ScaLFMM_CXX_FLAGS@")
#
SET(ScalFMM_SOURCE_DIR "@ScalFMM_SOURCE_DIR@")
SET(ScalFMM_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
...
...
@@ -36,8 +37,8 @@ SET(ScalFMM_USE_ADDONS "@ScalFMM_USE_ADDONS@")
SET(ScalFMM_USE_LOG "@ScalFMM_USE_LOG@")
SET(ScalFMM_USE_FFT "@ScalFMM_USE_FFT@")
SET(ScalFMM_USE_STARPU "@ScalFMM_USE_STARPU@")
#
SET(ScalFMM_USE_SSE "@ScalFMM_USE_SSE@")
#
SET(ScalFMM_USE_AVX
"@ScalFMM_USE_AVX@")
SET(ScalFMM_USE_SSE "@ScalFMM_USE_SSE@")
SET(ScalFMM_USE_AVX
"@ScalFMM_USE_AVX@")
#
SET(ScalFMM_DOC_TAGS "@CMAKE_BINARY_DIR@/Doc/scalfmm.tag")
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment