From 61d22cb1d246bcc8655afecb3288843085e58dbb Mon Sep 17 00:00:00 2001 From: Fabio Roberto Vitello <fabio.vitello@inaf.it> Date: Wed, 20 Jan 2021 15:27:29 +0100 Subject: [PATCH] updated Makefile --- Makefile | 82 +++++++++++--------------------------------------------- aprod.c | 1 - util.c | 2 +- 3 files changed, 17 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index 91d21ef..aeaed93 100644 --- a/Makefile +++ b/Makefile @@ -1,89 +1,39 @@ # Gaia GSRPar Makefile -COMPILER = /opt/ompss/bin/mcc -##COMPILER = /opt/openmpi_icc/bin/mpic++ -COMPILERCPP = /opt/ompss/bin/mcxx --ompss -DOMP -##COMPILERCPP = /opt/openmpi_icc/bin/mpic++ +COMPILER = mpiicpc -qopenmp -DOMP +COMPILERCPP = mpiicpc -qopenmp -DOMP -CC = $(COMPILERCPP) +CC = $(COMPILER) CPP= $(COMPILERCPP) -CFITSIOLIB=/opt/cfitsio3_1_0/lib +CFITSIOLIB=/opt/cluster/cfitsio/intel/2017.1/lib/ +GAIAINC=/u/ubecciani/EuroExa/CoreApp7.2/src - - -GAIAINC=/home-volume/ube/Gaia/ParallelCodeV7/src7.2 - - - -GAIAGSR= aprod.o lsqrblas.o lsqr.o solvergaia.o util.o GAIAGSRSIM= aprod.o lsqrblas.o lsqr.o solvergaiaSim.o util.o -GAIAGSRFits2Bin= fits2bin.o util.o lsqrblas.o -GAIAGSRBin2Fits= bin2fits.o -GAIAGSRBin2Reduced= bin2reduced.o util.o lsqrblas.o -GAIAGSRCkEmptyCols= util.o ckemptycols.o lsqrblas.o -GAIAGSRBin2Asc= bin2asc.o -GAIAGSRChTask= changeTask.o -GAIAGSRRepairTask= ripristino.o MEMREQ= memRequest.o - -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) -I/opt/local/include -I/opt/local/include/mpich2 -I/opt/cluster/cfitsio/intel/2017.1/include/ +INCLUDE = -I$(GAIAINC) -I/opt/cluster/cfitsio/intel/2017.1/include/ #INCLUDE = -I$(GAIAINC) #CFLAGS= $(INCLUDE) -std=c99 -CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack -CPPFLAGS= $(INCLUDE) -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 +#CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack +#CPPFLAGS= $(INCLUDE) -lirc -limf -lsvml +CPPFLAGS= $(INCLUDE) +LIB = -L$(CFITSIOLIB) -lcfitsio -lm -all: GaiaGsrParSim -####all: GaiaGsrPar MemReq GaiaGsrParSim GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced GaiaCkEmptyCols GaiaBin2Asc GaiaChTask GaiaRepTask +all: MemReq GaiaGsrParSim ###all: GaiaGsrPar MemReq GaiaGsrParTest GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced -ckemptycols.o: ckemptycols.cpp - $(CPP) $(CPPFLAGS) -c ckemptycols.cpp - -bin2fits.o: bin2fits.cpp - $(CPP) $(CPPFLAGS) -c bin2fits.cpp - -bin2asc.o: bin2asc.cpp - $(CPP) $(CPPFLAGS) -c bin2asc.cpp - - - -GaiaGsrPar: $(GAIAGSR) - $(CPP) $(CPPFLAGS) -o GaiaGsrPar $(GAIAGSR) $(INCLUDE) $(LIB) - -MemReq: $(MEMREQ) - $(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB) - GaiaGsrParSim: $(GAIAGSRSIM) $(CPP) $(CPPFLAGS) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB) -GaiaFits2Bin: $(GAIAGSRFits2Bin) - $(CPP) $(CPPFLAGS) -o GaiaFits2Bin $(GAIAGSRFits2Bin) $(INCLUDE) $(LIB) - -GaiaBin2Fits: $(GAIAGSRBin2Fits) - $(CPP) $(CPPFLAGS) -o GaiaBin2Fits $(GAIAGSRBin2Fits) $(INCLUDE) $(LIB) - -GaiaBin2Reduced: $(GAIAGSRBin2Reduced) - $(CPP) $(CPPFLAGS) -o GaiaBin2Reduced $(GAIAGSRBin2Reduced) $(INCLUDE) $(LIB) - -GaiaBin2Asc: $(GAIAGSRBin2Asc) - $(CPP) $(CPPFLAGS) -o GaiaBin2Asc $(GAIAGSRBin2Asc) $(INCLUDE) $(LIB) - - -GaiaCkEmptyCols: $(GAIAGSRCkEmptyCols) - $(CPP) $(CPPFLAGS) -o GaiaCkEmptyCols $(GAIAGSRCkEmptyCols) $(LIB) - -GaiaChTask: $(GAIAGSRChTask) - $(CPP) -o GaiaChTask $(GAIAGSRChTask) $(LIB) +MemReq: $(MEMREQ) + $(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB) -GaiaRepTask: $(GAIAGSRRepairTask) - $(CPP) $(CPPFLAGS) -o GaiaRepairTask $(GAIAGSRRepairTask) $(LIB) - clean: - rm -f *.o core \ No newline at end of file + rm -f *.o core + diff --git a/aprod.c b/aprod.c index 1557317..936f29b 100644 --- a/aprod.c +++ b/aprod.c @@ -8,7 +8,6 @@ #include "util.h" // NOTA: vedere come e cosa cambia aumentando i valori nAstroPSolved, nAttP e nInstrConst facendoli non usuali ma molto grossi - void aprod(int mode, long int m, long int n, double *vVect, double *knownTerms, double *systemMatrix, long int *matrixIndex, int *instrCol, int *instrConstrIlung, struct comData comlsqr, time_t *ompSec) { diff --git a/util.c b/util.c index b4e217c..d3d1ab2 100644 --- a/util.c +++ b/util.c @@ -2139,7 +2139,7 @@ float simfullram(long &nStar, long &nobs, float memGlobal, int nparam, int nAttP return prevmemGB; } -double aprodM1Obs(long ix,struct comData comlsqr, double *vVect, double *systemMatrix, long int *matrixIndex, int *instrCol){ +double aprodM1Obs(long ix,struct comData comlsqr, double *vVect, double *systemMatrix, long int *matrixIndex, int *instrCol){ int myid = comlsqr.myid; int nAstroPSolved = comlsqr.nAstroPSolved; -- GitLab