Commit 14a6b1c0 authored by BRAMAS Berenger's avatar BRAMAS Berenger

resolve conflict

parents cd3568f2 3a263271
......@@ -732,6 +732,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
##################################################################
# Remove compilation of the drivers #
##################################################################
message(STATUS "SCALFMM_BUILD_EXAMPLES = ${SCALFMM_BUILD_EXAMPLES}" )
if( SCALFMM_BUILD_EXAMPLES )
# Build - Examples and drivers
add_subdirectory(Examples)
......
......@@ -7,9 +7,18 @@ This file contains the main features as well as overviews of specific
bug fixes (and other actions) for each version of ScalFMM since
version 1.1
1.5
-----
- improvements of the MPI version of ScalFMM
- ScalFMM on StarPu (runtime system) is available
- Add P2P ?? on GPU
- Add GPU version for ufmm (interpolation FMM based on uniform grid points)
-
1.4
-----
- Add interpolation FMM based on uniform grid points
- Add interpolation FMM based on uniform grid points (ufmm)
- Add the group tree and the things related to starpu (runtime system)
- Change the P2P (it is now done by tree functions in the abstract kernel) refer to the P2P page of the doc
- Update the P2P/M2L prototype, the position of the elements is known from an array position
......
......@@ -109,5 +109,5 @@ FOREACH(my_dir ${my_include_dirs})
INSTALL( FILES ${hpp_in_dir} DESTINATION include/${my_dir} )
ENDFOREACH()
INSTALL( FILES "${SCALFMM_BINARY_DIR}/Src/ScalFmmConfig.h" DESTINATION include/Utils/${my_dir} )
INSTALL( FILES "${SCALFMM_BINARY_DIR}/Src/ScalFmmConfig.h" DESTINATION include/${my_dir} )
......@@ -23,6 +23,5 @@
FLog FLog::Controller;
#endif // SCALFMM_USE_DEBUG
......@@ -14,7 +14,9 @@
// "http://www.cecill.info".
// "http://www.gnu.org/licenses".
// ===================================================================================
// ==== CMAKE =====
// @BUG_INTEL
// ================
#include <iostream>
#include <iomanip>
......
......@@ -21,7 +21,10 @@
// ================
// Keep in private GIT
// ==== CMAKE =====
// @FUSE_FFT
// @FUSE_BLAS
// ================
#include <iostream>
#include <cstdio>
......
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