Commit a2539538 authored by berenger-bramas's avatar berenger-bramas

Rename define to keep name homogeneous.

But we can change it in a next commit if needed.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@55 2616d619-271b-44dc-8df4-d4a8f33a7222
parent b8890518
......@@ -8,26 +8,29 @@ STRING(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" insource)
IF(insource)
MESSAGE(FATAL_ERROR "${PROJECT_NAME} requires an out of source build. Goto ./Build and tapes cmake ../")
ENDIF(insource)
#
# Options
OPTION( SCALFMM_USE_CBLAS "Set to ON to build ScaFMM with BLAS" ON )
OPTION( FUSE_CBLAS "Set to ON to build ScaFMM with BLAS" ON )
OPTION( BUILD_TESTS "Set to ON to build fonctionnalities Tests" ON )
OPTION( BUILD_UTESTS "Set to ON to build UTests" ON )
#
if(SCALFMM_USE_CBLAS )
OPTION( SCALFMM_USE_MKL "Set to ON to build MKL CBLAS" OFF )
IF ( SCALFMM_USE_MKL )
if( FUSE_CBLAS )
OPTION( FUSE_MKL_AS_BLAS "Set to ON to use MKL CBLAS" OFF )
IF( FUSE_MKL_AS_BLAS )
SET(CBLAS_LIBRARIES "-L$ENV{MKLROOT}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")
ELSE ( SCALFMM_USE_MKL )
ELSE( FUSE_MKL_AS_BLAS )
FIND_PACKAGE(BLAS)
SET(CBLAS_LIBRARIES "-lcblas")
ENDIF ( SCALFMM_USE_MKL)
ENDIF(SCALFMM_USE_CBLAS)
ENDIF( FUSE_MKL_AS_BLAS )
ENDIF( FUSE_CBLAS )
#
ADD_DEFINITIONS(-O2 -Wall -Wshadow -Wpointer-arith -Wcast-qual)
CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Sources/ScalFMM_config.h.cmake
${CMAKE_BINARY_DIR}/Sources/ScalFMM_config.h )
# Build - lib
add_subdirectory(Sources)
......
......@@ -10,11 +10,13 @@ file(
source_lib_files
./*.cpp
)
add_library(
scalfmm
STATIC
${source_lib_files}
)
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/Sources
)
......
......@@ -883,7 +883,8 @@ public:
/////////////////////////////////////////////////////////////////////////////////
/**
*------------------
* expansion_M2L_add
* ff_full_matrix_Product
* ff_matrix_Product
* octree_Compute_local_exp_M2L
*-------------------
*We compute the conversion of multipole_exp_src in *p_center_of_exp_src to
......
#ifndef ScalFMM_CONFIG_H
#define ScalFMM_CONFIG_H
#cmakedefine SCALFMM_USE_MKL
#cmakedefine FUSE_MKL_AS_BLAS
#endif // CONFIG_H
#ifndef FBLAS_HPP
#define FBLAS_HPP
///////////////////////////////////////////////////////
// Manage Blas Version
///////////////////////////////////////////////////////
#include "ScalFMM_config.h"
#ifdef SCALFMM_USE_MKL
#ifdef FUSE_MKL_AS_BLAS
#include <mkl_cblas.h>
#else
#include <cblas.h>
......
......@@ -12,14 +12,9 @@ endif()
#add CBLAS
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CBLAS_LIBRARIES}")
#todo remove next line used to compile manually with intel compiler
#ADD_DEFINITIONS(-Wl,--start-group $(MKLROOT)/lib/ia32/libmkl_intel.a $(MKLROOT)/lib/ia32/libmkl_sequential.a $(MKLROOT)/lib/ia32/libmkl_core.a -Wl,--end-group -lpthread)
#test
# ADD_DEFINITIONS(-fexpensive-optimizations -funroll-loops -frerun-cse-after-loop -frerun-loop-opt)
# ADD_DEFINITIONS(-fomit-frame-pointer -fschedule-insns2 -minline-all-stringops )
# ADD_DEFINITIONS(-malign-double -falign-functions=4)
# ADD_DEFINITIONS(-fforce-addr -pipe)
# Link with fmb lib
set(fmb_lib scalfmm)
......
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