From b301c4fb9c386a0634c0caad169f9898285896f7 Mon Sep 17 00:00:00 2001
From: Fabio Roberto Vitello <fabio.vitello@inaf.it>
Date: Fri, 5 Jul 2019 10:28:09 +0200
Subject: [PATCH] Update Makefile

---
 Makefile | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f7c4a7a..9cff165 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,27 @@
 # Gaia GSRPar Makefile
 
-COMPILER = /opt/openmpi_icc/bin/mpic++ -openmp -DOMP
+JOB_SCHED_VERSION=-smp
+CFLAGS_I = --instrument
+EXTRA = -std=c99 -O3 -Wall -Wno-unused -mcmodel=large 
+
+BASE_DIR= /home/fvitello/ompss-ee-master
+
+COMMON_DIR=$(BASE_DIR)/common-files
+CONFIG_DIR=.config
+
+GFLAGS=
+
+PARAVER=extrae.xml trace.sh
+SCRIPTS=run-once.sh multirun.sh
+
+MPI_CHECK=$(MPI_LIB_DIR)/libmpi.so
+MKL_CHECK=$(MKL_LIB_DIR)/libmkl_sequential.so
+ATLAS_CHECK=$(ATLAS_LIB_DIR)/libatlas.a
+
+
+COMPILER = /opt/ompss/bin/mcc
 ##COMPILER = /opt/openmpi_icc/bin/mpic++ 
-COMPILERCPP =  /opt/openmpi_icc/bin/mpic++ -openmp  -DOMP
+COMPILERCPP =  /opt/ompss/bin/mcxx --ompss -DOMP
 ##COMPILERCPP =  /opt/openmpi_icc/bin/mpic++ 
 
 CC = $(COMPILERCPP)
@@ -31,12 +50,12 @@ MEMREQ= memRequest.o
 
 
 
-INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/openmpi_icc/include/ -I/opt/cfitsio3_1_0/include/
+INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/openmpi_icc/include/ -I/opt/cfitsio3_1_0/include/ -I/opt/openmpi/include -pthread
 #INCLUDE = -I$(GAIAINC) 
 #CFLAGS= $(INCLUDE)  -std=c99 
 CPPFLAGS= $(INCLUDE)   -g -fsanitize=address -mllvm -asan-stack
-CPPFLAGS= $(INCLUDE)    
-LIB = -L$(CFITSIOLIB) -lcfitsio -lm
+CPPFLAGS= $(INCLUDE)   $(CFLAGS_I) $(EXTRA)
+LIB = 	-pthread -L/usr/local/pbspro/lib -Wl,-rpath -Wl,/usr/local/pbspro/lib -Wl,-rpath -Wl,/opt/openmpi/lib -Wl,--enable-new-dtags -L/opt/openmpi/lib -lmpi	 -L$(CFITSIOLIB) -lcfitsio -lm
 
 all:	GaiaGsrParSim
 
-- 
GitLab