Commit 9f516fbf authored by BRAMAS Berenger's avatar BRAMAS Berenger
parents 0735694b e3353803
...@@ -156,7 +156,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/") ...@@ -156,7 +156,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
ADD_DEFINITIONS(-O0) ADD_DEFINITIONS(-O0)
if( APPLE ) if( APPLE )
set(SCALFMM_FLAGS_OPTI_DEBUG "-m64 -funroll-loops" CACHE STRING set(SCALFMM_FLAGS_OPTI_DEBUG "-funroll-loops" CACHE STRING
"Set your optimization flags for debug mode.") "Set your optimization flags for debug mode.")
else(APPLE) else(APPLE)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
...@@ -187,7 +187,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/") ...@@ -187,7 +187,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif() endif()
# Compile optimization # Compile optimization
if(APPLE) if(APPLE)
set(SCALFMM_FLAGS_OPTI_RELEASE "-m64 -funroll-loops" CACHE STRING set(SCALFMM_FLAGS_OPTI_RELEASE "-funroll-loops" CACHE STRING
"Set your optimization flags for release mode.") "Set your optimization flags for release mode.")
else(APPLE) else(APPLE)
# Not apple system - Check the compiler flags # Not apple system - Check the compiler flags
...@@ -338,7 +338,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/") ...@@ -338,7 +338,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
# Default is DOUBLE and without THREADS|OMP # Default is DOUBLE and without THREADS|OMP
find_package(FFTW) # not REQUIRED find_package(FFTW) # not REQUIRED
set(FFT_LIBRARIES "-L${FFTW_LIBRARY_DIRS_DEP};" CACHE STRING "Set your MKL flags") set(FFT_LIBRARIES "-L${FFTW_LIBRARY_DIRS_DEP};" CACHE STRING "Set your MKL flags")
foreach (fft_lib ${FFTW_LIBRARIES_DEP}) foreach (fft_lib ${FFTW_LIBRARIES_DEP})
set(FFT_LIBRARIES "${FFT_LIBRARIES} ${fft_lib};") set(FFT_LIBRARIES "${FFT_LIBRARIES} ${fft_lib};")
endforeach() endforeach()
...@@ -361,6 +361,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/") ...@@ -361,6 +361,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif() endif()
endif(SCALFMM_USE_FFT) endif(SCALFMM_USE_FFT)
list(APPEND FUSE_LIST "FFT") list(APPEND FUSE_LIST "FFT")
message(STATUS " SCALFMM_LIBRARIES = ${SCALFMM_LIBRARIES}")
message(STATUS " SCALFMM_INCLUDES = ${SCALFMM_INCLUDES}")
# Compile option # Compile option
#ADD_DEFINITIONS(-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion -fpic ) #ADD_DEFINITIONS(-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wconversion -fpic )
...@@ -562,7 +565,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/") ...@@ -562,7 +565,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
# Generate ScalFmmConfig.h # Generate ScalFmmConfig.h
# #
set(SCALFMM_COMPILE_FLAGS "${SCALFMM_CXX_FLAGS} ${CMAKE_CXX_FLAGS_TYPE} ${CMAKE_CXX_FLAGS}") set(SCALFMM_COMPILE_FLAGS "${SCALFMM_CXX_FLAGS} ${CMAKE_CXX_FLAGS_TYPE} ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${SCALFMM_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS_TYPE} ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${SCALFMM_COMPILE_FLAGS}")
# set(CMAKE_CXX_FLAGS "${SCALFMM_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS_TYPE} ${CMAKE_CXX_FLAGS}")
set(SCALFMM_COMPILE_LIBS "${SCALFMM_LIBRARIES}") set(SCALFMM_COMPILE_LIBS "${SCALFMM_LIBRARIES}")
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake
${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h ) ${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h )
......
...@@ -6,10 +6,16 @@ Copyright (c) 2011-2014 Inria, All rights reserved. ...@@ -6,10 +6,16 @@ Copyright (c) 2011-2014 Inria, All rights reserved.
This file contains the main features as well as overviews of specific This file contains the main features as well as overviews of specific
bug fixes (and other actions) for each version of ScalFMM since bug fixes (and other actions) for each version of ScalFMM since
version 1.1 version 1.1
1.3- 1.3 in progress
----- -----
- The choice of floating point values is done by template (by passing template to all classes) and no more at configure time
- There is no more ScalFMM variables and defines but only SCALFMM (all letters in upper case)
- BLAS and FFTW are turned on by default, and the compilation continue even if they are not found
- We start to use unique ptr (and advise to use it) in the main files
- Add interpolation FMM based on uniform grid points. - Add interpolation FMM based on uniform grid points.
- Add blocked version of the algorithm to increase the granularity (task-based approach) - Add blocked version of the algorithm to increase the granularity (task-based approach)
- Fix bug with Chebyschev kernel and multi RHS.
- Improvements in unit tests (works with Linux and MacOs X for intel and gcc)
- -
1.2.1 1.2.1
...@@ -30,10 +36,3 @@ version 1.1 ...@@ -30,10 +36,3 @@ version 1.1
- Add SSE and AVX support in CMake - Add SSE and AVX support in CMake
- Add SSE and AVX code for 1/r kernel - Add SSE and AVX code for 1/r kernel
- CMake improvements - CMake improvements
1.3 in progress
-----
- The choice of floating point values is done by template (by passing template to all classes) and no more at configure time
- There is no more ScalFMM variables and defines but only SCALFMM (all letters in upper case)
- BLAS and FFTW are turned on by default, and the compilation continue even if they are not found
- We start to use unique ptr (and advise to use it) in the main files
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment