Unverified Commit 095801e1 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #2071 from wmbrownIntel/wmb_mf_cleanup 

Partial Cleanup of Conventional Build Makefiles.
parents 3b77546e ec093975

src/MAKE/MACHINES/Makefile.beacon

deleted100644 → 0
+0 −119
Original line number Diff line number Diff line 
# beacon = RedHat Linux box, Intel icc, MPICH2, FFTW



SHELL = /bin/sh



# ---------------------------------------------------------------------

# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		mpiicpc -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64

MIC_OPT =       -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""

CCFLAGS =	-O3 -xAVX -fno-alias -ansi-alias -restrict -override-limits $(MIC_OPT)

SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpiicpc -openmp

LINKFLAGS =	-O3 -xAVX

LIB =           -ltbbmalloc

SIZE =		size



ARCHIVE =	ar

ARFLAGS =	-rc

SHLIBFLAGS =	-shared



# ---------------------------------------------------------------------

# LAMMPS-specific settings, all OPTIONAL

# specify settings for LAMMPS features you will use

# if you change any -D setting, do full re-compile after "make clean"



# LAMMPS ifdef settings

# see possible settings in Section 3.5 of the manual



LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG



# MPI library

# see discussion in Section 3.4 of the manual

# MPI wrapper compiler/linker can provide this info

# can point to dummy MPI library in src/STUBS as in Makefile.serial

# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts

# INC = path for mpi.h, MPI compiler settings

# PATH = path for MPI library

# LIB = name of MPI library



MPI_INC =       -DMPICH_SKIP_MPICXX 

MPI_PATH = 

MPI_LIB =  



# FFT library

# see discussion in Section 3.5.2 of manual

# can be left blank to use provided KISS FFT library

# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings

# PATH = path for FFT library

# LIB = name of FFT library



FFT_INC =      -DFFT_MKL -DFFT_SINGLE -I$(MKLROOT)

FFT_PATH = 

FFT_LIB =	-L$(MKLROOT) -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core



# JPEG and/or PNG library

# see discussion in Section 3.5.4 of manual

# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC

# INC = path(s) for jpeglib.h and/or png.h

# PATH = path(s) for JPEG library and/or PNG library

# LIB = name(s) of JPEG library and/or PNG library



JPG_INC =       

JPG_PATH = 	

JPG_LIB =	-ljpeg



# ---------------------------------------------------------------------

# build rules and dependencies

# do not edit this section



include Makefile.package.settings

include Makefile.package



EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)

EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)

EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)

EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)

EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)



# Path to src files



vpath %.cpp ..

vpath %.h ..



# Link target



$(EXE): main.o $(LMPLIB) $(EXTRA_LINK_DEPENDS)

	$(LINK) $(LINKFLAGS) main.o $(EXTRA_PATH) $(LMPLINK) $(EXTRA_LIB) $(LIB) -o $@

	$(SIZE) $@



# Library targets



$(ARLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)

	$(ARCHIVE) $(ARFLAGS) ../$(ARLIB) $(OBJ)

	@rm -f $(ARLIB)

	@ln -s ../$(ARLIB) $(ARLIB)



$(SHLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)

	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o ../$(SHLIB) \

		$(OBJ) $(EXTRA_LIB) $(LIB)

	@rm -f $(SHLIB)

	@ln -s ../$(SHLIB) $(SHLIB)



# Compilation rules



%.o:%.cpp

	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<



# Individual dependencies



depend : fastdep.exe $(SRC)

	@./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1



fastdep.exe: ../DEPEND/fastdep.c

	cc -O -o $@ $<



sinclude .depend

src/MAKE/MACHINES/Makefile.cori2

+4 −2
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ SHELL = /bin/sh 
# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		CC

CC =		CC -std=c++11

OPTFLAGS =      -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -qoverride-limits

CCFLAGS =	-qopenmp -qno-offload -fno-alias -ansi-alias -restrict \

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG -DLMP_INTEL_NO_TBB \

                $(OPTFLAGS)

SHFLAGS =	-fPIC
@@ -85,6 +85,8 @@ include Makefile.package 
EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)

EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)

EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)

EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)

EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)



# Path to src files

src/MAKE/MACHINES/Makefile.jaguar

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
# jaguar = ORNL Jaguar Cray XT5, CC, native MPICH, FFTW



SHELL = /bin/sh



# ---------------------------------------------------------------------

# compiler/linker settings

# specify flags and libraries needed for your compiler



CXX =           CC

CCFLAGS =	-g -O

SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		$(CXX)

LINKFLAGS =	-g -O

LIB =           

SIZE =		size



ARCHIVE =	ar

ARFLAGS =	-rc

SHLIBFLAGS =	-shared



# ---------------------------------------------------------------------

# LAMMPS-specific settings, all OPTIONAL

# specify settings for LAMMPS features you will use

# if you change any -D setting, do full re-compile after "make clean"



# LAMMPS ifdef settings

# see possible settings in Section 3.5 of the manual



LMP_INC =	-DLAMMPS_GZIP -DNODE_PARTITION



# MPI library

# see discussion in Section 3.4 of the manual

# MPI wrapper compiler/linker can provide this info

# can point to dummy MPI library in src/STUBS as in Makefile.serial

# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts

# INC = path for mpi.h, MPI compiler settings

# PATH = path for MPI library

# LIB = name of MPI library



MPI_INC =       -DMPICH_SKIP_MPICXX 

MPI_PATH = 

MPI_LIB =	-lmpich -lpthread



# FFT library

# see discussion in Section 3.5.2 of manual

# can be left blank to use provided KISS FFT library

# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings

# PATH = path for FFT library

# LIB = name of FFT library



FFT_INC =       -DFFT_FFTW3 -I$(FFTW_INC)

FFT_PATH =	 -L$(FFTW_DIR)

FFT_LIB =	-lfftw3



# JPEG and/or PNG library

# see discussion in Section 3.5.4 of manual

# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC

# INC = path(s) for jpeglib.h and/or png.h

# PATH = path(s) for JPEG library and/or PNG library

# LIB = name(s) of JPEG library and/or PNG library



JPG_INC =

JPG_PATH =

JPG_LIB =



# ---------------------------------------------------------------------

# build rules and dependencies

# do not edit this section



include Makefile.package.settings

include Makefile.package



EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)

EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)

EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)

EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)

EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)



# Path to src files



vpath %.cpp ..

vpath %.h ..



# Link target



$(EXE): main.o $(LMPLIB) $(EXTRA_LINK_DEPENDS)

	$(LINK) $(LINKFLAGS) main.o $(EXTRA_PATH) $(LMPLINK) $(EXTRA_LIB) $(LIB) -o $@

	$(SIZE) $@



# Library targets



$(ARLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)

	$(ARCHIVE) $(ARFLAGS) ../$(ARLIB) $(OBJ)

	@rm -f $(ARLIB)

	@ln -s ../$(ARLIB) $(ARLIB)



$(SHLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)

	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o ../$(SHLIB) \

		$(OBJ) $(EXTRA_LIB) $(LIB)

	@rm -f $(SHLIB)

	@ln -s ../$(SHLIB) $(SHLIB)



# Compilation rules



%.o:%.cpp

	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<



# Individual dependencies



depend : fastdep.exe $(SRC)

	@./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1



fastdep.exe: ../DEPEND/fastdep.c

	cc -O -o $@ $<



sinclude .depend

src/MAKE/MACHINES/Makefile.stampede

deleted100644 → 0
+0 −119
Original line number Diff line number Diff line 
# stampede = Intel Compiler, MKL FFT, Offload to Xeon Phi



SHELL = /bin/sh



# ---------------------------------------------------------------------

# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		mpicc -qopenmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64

MIC_OPT =       -qoffload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""

CCFLAGS =	-O3 -xhost -fp-model precise -restrict -qoverride-limits $(MIC_OPT)

SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpicc -qopenmp

LINKFLAGS =	-O3 -xhost

LIB =           -ltbbmalloc

SIZE =		size



ARCHIVE =	ar

ARFLAGS =	-rc

SHLIBFLAGS =	-shared



# ---------------------------------------------------------------------

# LAMMPS-specific settings, all OPTIONAL

# specify settings for LAMMPS features you will use

# if you change any -D setting, do full re-compile after "make clean"



# LAMMPS ifdef settings

# see possible settings in Section 3.5 of the manual



LMP_INC =	-DLAMMPS_GZIP



# MPI library

# see discussion in Section 3.4 of the manual

# MPI wrapper compiler/linker can provide this info

# can point to dummy MPI library in src/STUBS as in Makefile.serial

# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts

# INC = path for mpi.h, MPI compiler settings

# PATH = path for MPI library

# LIB = name of MPI library



MPI_INC =       -DMPICH_SKIP_MPICXX 

MPI_PATH = 

MPI_LIB =



# FFT library

# see discussion in Section 3.5.2 of manual

# can be left blank to use provided KISS FFT library

# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings

# PATH = path for FFT library

# LIB = name of FFT library



FFT_INC =      -DFFT_MKL -I$(TACC_MKL_INC)

FFT_PATH = 

FFT_LIB =	-L$(TACC_MKL_LIB) -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core



# JPEG and/or PNG library

# see discussion in Section 3.5.4 of manual

# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC

# INC = path(s) for jpeglib.h and/or png.h

# PATH = path(s) for JPEG library and/or PNG library

# LIB = name(s) of JPEG library and/or PNG library



JPG_INC =       

JPG_PATH = 	

JPG_LIB =	-ljpeg



# ---------------------------------------------------------------------

# build rules and dependencies

# do not edit this section



include Makefile.package.settings

include Makefile.package



EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)

EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)

EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)

EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)

EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)



# Path to src files



vpath %.cpp ..

vpath %.h ..



# Link target



$(EXE): main.o $(LMPLIB) $(EXTRA_LINK_DEPENDS)

	$(LINK) $(LINKFLAGS) main.o $(EXTRA_PATH) $(LMPLINK) $(EXTRA_LIB) $(LIB) -o $@

	$(SIZE) $@



# Library targets



$(ARLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)

	$(ARCHIVE) $(ARFLAGS) ../$(ARLIB) $(OBJ)

	@rm -f $(ARLIB)

	@ln -s ../$(ARLIB) $(ARLIB)



$(SHLIB): $(OBJ) $(EXTRA_LINK_DEPENDS)

	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o ../$(SHLIB) \

		$(OBJ) $(EXTRA_LIB) $(LIB)

	@rm -f $(SHLIB)

	@ln -s ../$(SHLIB) $(SHLIB)



# Compilation rules



%.o:%.cpp

	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<



# Individual dependencies



depend : fastdep.exe $(SRC)

	@./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1



fastdep.exe: ../DEPEND/fastdep.c

	cc -O -o $@ $<



sinclude .depend

src/MAKE/MACHINES/Makefile.theta

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ SHELL = /bin/sh 


CC =        CC -mkl

OPTFLAGS =  -xMIC-AVX512 -O3 -fp-model fast=2 -no-prec-div -qoverride-limits

CCFLAGS =   -g -qopenmp -DLAMMPS_MEMALIGN=64 -qno-offload \

                -fno-alias -ansi-alias -restrict $(OPTFLAGS)

CCFLAGS =   -g -qopenmp -qno-offload -ansi-alias -restrict \

            -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS)

CCFLAGS +=  -std=c++11

SHFLAGS =   -fPIC

DEPFLAGS =  -M

CRA Git | Maintained and supported by SUSTech CRA and CCSE