Makefile cleanup

MAKE/Makefile.kstppd

@@ -1,51 +1,36 @@
-#Kostis Papadakis
-#======== Vectorization ==========
-#Set vector backend type for vlasov solvers, sets precision and length.
-#NOTE this has to have the same precision as the distribution function define (DISTRIBUTION_FP_PRECISION)
-#Options:
-# AVX:	    VEC4D_AGNER, VEC4F_AGNER, VEC8F_AGNER
-# AVX512:   VEC8D_AGNER, VEC16F_AGNER
-# Fallback: VEC4D_FALLBACK, VEC4F_FALLBACK, VEC8F_FALLBACK
-
-ifeq ($(DISTRIBUTION_FP_PRECISION),SPF)
-#Single-precision
-	VECTORCLASS = VEC4F_FALLBACK
-else
-#Double-precision
-	VECTORCLASS = VEC4D_FALLBACK
-endif
-
-
-#======== Allocator =========
-#Use TBB malloc
-
+#Kostis Laptop
+#Compiler & Linker
 CMP = mpic++
 LNK = mpic++
 
-PAPI_FLAG =
 
 #======== Vectorization ==========
 #Set vector backend type for vlasov solvers, sets precision and length.
 #NOTE this has to have the same precision as the distribution function define (DISTRIBUTION_FP_PRECISION)
-#Options:
+#Options;
 # AVX:	    VEC4D_AGNER, VEC4F_AGNER, VEC8F_AGNER
 # AVX512:   VEC8D_AGNER, VEC16F_AGNER
 # Fallback: VEC4D_FALLBACK, VEC4F_FALLBACK, VEC8F_FALLBACK
 
 ifeq ($(DISTRIBUTION_FP_PRECISION),SPF)
 #Single-precision
-	VECTORCLASS = VEC8F_AGNER
+	VECTORCLASS = VEC4F_FALLBACK
 else
 #Double-precision
-	VECTORCLASS = VEC4D_AGNER
+	VECTORCLASS = VEC4D_FALLBACK
 endif
 
+
+#======== Flags =========
+
 FLAGS =
-#CXXFLAGS = -I $(HOME)/include  -L $(HOME)/lib -g  -funroll-loops -std=c++0x -fopenmp -W -Wall -pedantic -Wno-unused -fabi-version=0 -mavx
-CXXFLAGS = -I $(HOME)/include  -L $(HOME)/lib -O3  -funroll-loops -std=c++0x -fopenmp -W -Wall -Wno-unused -fabi-version=0 -mavx
+CXXFLAGS = -O3   -funroll-loops -std=c++17 -fopenmp -W -Wall -Wno-unused -Wno-unused-parameter -Wno-missing-braces -fabi-version=0 -mavx
+testpackage: CXXFLAGS = -g -ggdb -O2 -fopenmp -funroll-loops -std=c++17 -fabi-version=0  -mno-avx -mno-fma -fno-unsafe-math-optimizations
+CXXFLAGS += -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -DPAPI_MEM
 MATHFLAGS = -ffast-math
+testpackage: MATHFLAGS =  -fno-unsafe-math-optimizations
 LDFLAGS = -L $(HOME)/lib
-LIB_MPI = -lgomp
+LIB_MPI = -lgomp -lpapi 
 
 
 #======== Libraries ===========
@@ -70,15 +55,14 @@ INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg
 
 INC_FSGRID = -I$(LIBRARY_PREFIX)/fsgrid
 
-#INC_JEMALLOC = -I$(LIBRARY_PREFIX)/include/jemalloc
-#LIB_JEMALLOC = -L$(LIBRARY_PREFIX)/lib -ljemalloc
+INC_PAPI = -I$(LIBRARY_PREFIX)/papi-5.4.3/src
+LIB_PAPI = -L$(LIBRARY_PREFIX)/papi-5.4.3/src -lpapi
 
-INC_JEMALLOC = -I/home/kostis/libraries/jemalloc
-LIB_JEMALLOC = -L/home/kostis/libraries/jemalloc/lib -ljemalloc
+INC_JEMALLOC = -I$(LIBRARY_PREFIX)/libraries/jemalloc
+LIB_JEMALLOC = -L$(LIBRARY_PREFIX)/libraries/jemalloc/lib -ljemalloc
 
 LIB_PROFILE = -L$(LIBRARY_PREFIX)/phiprof/lib -lphiprof
 INC_PROFILE = -I$(LIBRARY_PREFIX)/phiprof/include
-INC_TOPO =
 
 INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen-eigen-07105f7124f9