scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the use of TBB allocator.

This commit is contained in:
Ye Luo 2017-07-27 16:30:28 -05:00
parent 12f0ad61b3
commit fe5fdb18fd
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/FindMKL.cmake
View File

@ -27,7 +27,7 @@ IF ( HAVE_MKL )
SET( MKL_FOUND 1 )
SET( MKL_FLAGS -mkl )
SET( MKL_LIBRARIES )
SET( MKL_LINKER_FLAGS -mkl -ltbbmalloc -ltbb)
SET( MKL_LINKER_FLAGS -mkl )
IF ( HAVE_MKL_FFTW3 )
FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/include/fftw3.h" "#include <fftw/fftw3.h>\n" )
INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_BINARY_DIR}/include" )

11
src/simd/allocator.hpp
View File

@ -19,18 +19,13 @@
#include <cstdlib>
#if (__cplusplus >= 201103L)
#if defined(__INTEL_COMPILER)
#include <tbb/cache_aligned_allocator.h>
#else
#include "simd/Mallocator.hpp"
#endif
#include "simd/Mallocator.hpp"
namespace qmcplusplus
{
template<class T>
#if defined(__INTEL_COMPILER)
using aligned_allocator=tbb::cache_aligned_allocator<T>;
#elif __bgq__
#if defined(__bgq__)
using aligned_allocator=std::allocator<T>;
#else
using aligned_allocator=qmcplusplus::Mallocator<T, QMC_CLINE>;