ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify compiling USER-INTEL package, by defaulting to -DLAMMPS_MEMALIGN=64 in case it is not set

Browse Source
This commit is contained in:
Axel Kohlmeyer
2016-11-09 16:53:39 -05:00
parent bfea3dce7d
commit fec87c070d
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/USER-INTEL/intel_preprocess.h
View File

@ -28,12 +28,10 @@
#ifndef LMP_INTEL_PREPROCESS_H #ifndef LMP_INTEL_PREPROCESS_H
#define LMP_INTEL_PREPROCESS_H #define LMP_INTEL_PREPROCESS_H
#ifndef LAMMPS_MEMALIGN // LAMMPS_MEMALIGN is set to 64 by default for -DLMP_USER_INTEL
#error Please set -DLAMMPS_MEMALIGN=64 in CCFLAGS for your LAMMPS makefile. // so we only need to error out in case of a different alignment
#else #if LAMMPS_MEMALIGN && (LAMMPS_MEMALIGN != 64)
#if (LAMMPS_MEMALIGN != 64) #error Please set -DLAMMPS_MEMALIGN=64 in CCFLAGS of your LAMMPS makefile for USER-INTEL package
#error Please set -DLAMMPS_MEMALIGN=64 in CCFLAGS for your LAMMPS makefile.
#endif
#endif #endif
#if defined(_OPENMP) #if defined(_OPENMP)

4
src/memory.cpp
View File

@ -22,6 +22,10 @@
#include "tbb/scalable_allocator.h" #include "tbb/scalable_allocator.h"
#endif #endif
#if defined(LMP_USER_INTEL) && !defined(LAMMPS_MEMALIGN)
#define LAMMPS_MEMALIGN 64
#endif
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

4
src/my_page.h
View File

@ -48,6 +48,10 @@ methods:
#ifndef LAMMPS_MY_PAGE_H #ifndef LAMMPS_MY_PAGE_H
#define LAMMPS_MY_PAGE_H #define LAMMPS_MY_PAGE_H
#if defined(LMP_USER_INTEL) && !defined(LAMMPS_MEMALIGN)
#define LAMMPS_MEMALIGN 64
#endif
#include <stdlib.h> #include <stdlib.h>
namespace LAMMPS_NS { namespace LAMMPS_NS {