From ab96bc637e7932f7d9825fbf122ffdd613ba9120 Mon Sep 17 00:00:00 2001 From: Dave Whipp <dwhipp@dal.ca> Date: Mon, 17 Jan 2011 19:48:40 +0000 Subject: [PATCH] Cleaned up commented out lines --- src/Makefile.inc.gpc.intelmpi | 17 ++-------- src/Makefile.inc.gpc.mvapich2 | 62 +++++++++++++---------------------- 2 files changed, 24 insertions(+), 55 deletions(-) diff --git a/src/Makefile.inc.gpc.intelmpi b/src/Makefile.inc.gpc.intelmpi index a3b29bcd..7103f5e0 100644 --- a/src/Makefile.inc.gpc.intelmpi +++ b/src/Makefile.inc.gpc.intelmpi @@ -1,10 +1,6 @@ # Define our compilers................................. # -# The default - OpenMPI -#MPI_HOME=/scinet/gpc/mpi/openmpi/1.3.2-intel-v11.0-ofed -# The alternative - MVAPICH2 -#MPI_HOME=/scinet/gpc/mpi/mvapich2/1.4rc1-3378_intel-v11.0_ofed -# Alternative 2 - IntelMPI +# IntelMPI #MPI_HOME=/scinet/gpc/intel/impi/3.2.2.006 MPI_HOME=/scinet/gpc/intel/impi/4.0.0.027 F90 = $(MPI_HOME)/bin64/mpif90 @@ -43,10 +39,6 @@ F77FLAGS = -fast #F77FLAGS = -O0 -fp-model strict -g -debug all #F90FLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0 #F77FLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0 -#F90FLAGS = -fast -Mipa=fast,inline -Kieee -tp amd64 -#F77FLAGS = -fast -Mipa=fast,inline -Kieee -tp amd64 -#F90FLAGS = -O2 -Kieee -tpp7 -#F77FLAGS = -O2 -Kieee -tpp7 # Define C compiler flags............................. # @@ -58,10 +50,8 @@ CFLAGS = -fast -I. #CFLAGS = -O0 -DMKL_ILP64 -I. -fp-model strict -g -debug all #CFLAGS = -O0 -I. -fp-model strict -g -debug all #CFLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0 -#CFLAGS = -fast -Mipa=fast,inline -Msmartalloc -I. -Kieee -tp amd64 -#CFLAGS = -O2 -I. -Kieee -tpp7 -# Libraries +# Libraries............................. # Intel MKL libs #LMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib @@ -70,10 +60,7 @@ LMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/lib # MPI # MPI = -L$(MPI_HOME)/lib64 -lmpi -#MPI = -L$(MPI_HOME)/lib -lmpich -#WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64/lib/Intel -#WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64-MPI2 WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64-IMPI LIBS = \ diff --git a/src/Makefile.inc.gpc.mvapich2 b/src/Makefile.inc.gpc.mvapich2 index ee95d78c..a30f34c2 100644 --- a/src/Makefile.inc.gpc.mvapich2 +++ b/src/Makefile.inc.gpc.mvapich2 @@ -1,8 +1,6 @@ # Define our compilers................................. # -# The default - OpenMPI -#MPI_HOME=/scinet/gpc/mpi/openmpi/1.3.2-intel-v11.0-ofed -# The alternative - MVAPICH2 +# MVAPICH2 MPI_HOME=/scinet/gpc/mpi/mvapich2/1.4rc1-3378_intel-v11.0_ofed F90 = $(MPI_HOME)/bin/mpif90 F77 = $(MPI_HOME)/bin/mpif90 @@ -12,7 +10,8 @@ CC = $(MPI_HOME)/bin/mpicc AR=xiar BITS= -IMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/include +#IMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/include +IMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/include INCLUDE=-I$(IMKL) # Define FORTRAN compiler flags....................... @@ -20,56 +19,44 @@ INCLUDE=-I$(IMKL) # For the PGI compiler #F90FLAGS = -O0 #F77FLAGS = -O0 +#F90FLAGS = -O1 +#F77FLAGS = -O1 +#F90FLAGS = -O2 +#F77FLAGS = -O2 +#F90FLAGS = -O3 +#F77FLAGS = -O3 F90FLAGS = -fast F77FLAGS = -fast #F90FLAGS = -O0 -mp -tpp7 -g -debug all -check all -implicitnone -warn unused -fp-stack-check -heap-arrays -ftrapuv -check pointers -check bounds #F77FLAGS = -O0 -mp -tpp7 -g -debug all -check all -implicitnone -warn unused -fp-stack-check -heap-arrays -ftrapuv -check pointers -check bounds #F90FLAGS = -O0 -i8 -fp-model strict -g -debug all -implicitnone -fp-stack-check -heap-arrays -ftrapuv -check pointers #F77FLAGS = -O0 -i8 -fp-model strict -g -debug all -implicitnone -fp-stack-check -heap-arrays -ftrapuv -check pointers -#F90FLAGS = -O0 -fp-model strict -#F77FLAGS = -O0 -fp-model strict -#F90FLAGS = -fast -Mipa=fast,inline -Kieee -tp amd64 -#F77FLAGS = -fast -Mipa=fast,inline -Kieee -tp amd64 -#F90FLAGS = -O2 -Kieee -tpp7 -#F77FLAGS = -O2 -Kieee -tpp7 +#F90FLAGS = -O0 -fp-model strict -g -debug all +#F77FLAGS = -O0 -fp-model strict -g -debug all +#F90FLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0 +#F77FLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0 # Define C compiler flags............................. # #CFLAGS = -O0 -I. +#CFLAGS = -O1 -I. +#CFLAGS = -O2 -I. +#CFLAGS = -O3 -I. CFLAGS = -fast -I. #CFLAGS = -O0 -DMKL_ILP64 -I. -fp-model strict -g -debug all -#CFLAGS = -O0 -I. -fp-model strict -#CFLAGS = -fast -Mipa=fast,inline -Msmartalloc -I. -Kieee -tp amd64 -#CFLAGS = -O2 -I. -Kieee -tpp7 +#CFLAGS = -O0 -I. -fp-model strict -g -debug all +#CFLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0 -# Libraries -#SCALAPACK = -L/scinet/gpc/intel/Compiler/11.1/056/mkl/lib/em64t -lmkl_scalapack_lp64 - -# Blacs -# -#BLACSCINIT = /usr/local/blacs/LIB/blacsCinit_MPI-LINUX-0.a -#BLACSFINIT = /usr/local/blacs/LIB/blacsF77init_MPI-LINUX-0.a -#BLACSL = /usr/local/blacs/LIB/blacs_MPI-LINUX-0.a -#BLACSCINIT = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib/em64t/libmkl_blacs_openmpi_lp64.a -#BLACSFINIT = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib/em64t/libmkl_blacs_openmpi_lp64.a -#BLACSL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib/em64t/libmkl_blacs_openmpi_lp64.a -#BLACSC = $(BLACSCINIT) $(BLACSL) $(BLACSCINIT) -#BLACSF = $(BLACSFINIT) $(BLACSL) $(BLACSFINIT) -#BLACS = $(BLACSC) $(BLACSF) +# Libraries............................. # Intel MKL libs -LMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib +#LMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib +LMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/lib # MPI -# -#MPI = -L$(MPI_HOME)/lib -lmpi MPI = -L$(MPI_HOME)/lib -lmpich WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64/lib/Intel -#WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64-MPI2 - -# Use Google's TCMalloc -#TCML = /home/dwhipp/software/tcml LIBS = \ -LOCTREE -lOctree$(BITS) \ @@ -78,13 +65,8 @@ LIBS = \ -LCASCADE -lcascade$(BITS) \ -LRESAMPLE -lresample$(BITS) \ -L$(WSMP) -lpwsmp64mpi2 \ - -L$(LMKL) -lmkl_scalapack_lp64 -lmkl_blacs_lp64 \ - -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 \ + -L$(LMKL) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 \ $(MPI) -lpthread - #-L$(TCML) -ltcmalloc_minimal \ - #-L$(TCML) -lstacktrace \ - #-L$(TCML) -lunwind \ - #-L$(LMKL) -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_lp64 \ # The Makefiles look at compile output with this PAGER=more -- GitLab