Skip to content
Snippets Groups Projects
Commit f4fec858 authored by Fabio Roberto Vitello's avatar Fabio Roberto Vitello
Browse files

Base Version of CoreApp with MPI+openMP

parent 8598150d
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
GaiaGsrParSim deleted 100755 → 0
+ 0
− 0
View file @ 8598150d
File deleted
Makefile
+ 15
− 65
View file @ f4fec858
# Gaia GSRPar Makefile # Gaia GSRPar Makefile
COMPILER = /opt/ompss/bin/mcc COMPILER = mpiicpc -qopenmp -DOMP
##COMPILER = /opt/openmpi_icc/bin/mpic++ COMPILERCPP = mpiicpc -qopenmp -DOMP
COMPILERCPP = /opt/ompss/bin/mcxx --ompss -DOMP
##COMPILERCPP = /opt/openmpi_icc/bin/mpic++
CC = $(COMPILERCPP) CC = $(COMPILER)
CPP= $(COMPILERCPP) 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 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 MEMREQ= memRequest.o
##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/local/include -I/opt/openmpi_icc/include/ -I/opt/cfitsio3_1_0/include/ -I/opt/openmpi/include -pthread INCLUDE = -I$(GAIAINC) -I/opt/cluster/cfitsio/intel/2017.1/include/
#INCLUDE = -I$(GAIAINC) #INCLUDE = -I$(GAIAINC)
#CFLAGS= $(INCLUDE) -std=c99 #CFLAGS= $(INCLUDE) -std=c99
CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack #CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack
#CPPFLAGS= $(INCLUDE) -lirc -limf -lsvml
CPPFLAGS= $(INCLUDE) 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 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 ###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) GaiaGsrParSim: $(GAIAGSRSIM)
$(CPP) $(CPPFLAGS) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB) $(CPP) $(CPPFLAGS) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB)
GaiaFits2Bin: $(GAIAGSRFits2Bin) MemReq: $(MEMREQ)
$(CPP) $(CPPFLAGS) -o GaiaFits2Bin $(GAIAGSRFits2Bin) $(INCLUDE) $(LIB) $(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(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)
GaiaRepTask: $(GAIAGSRRepairTask)
$(CPP) $(CPPFLAGS) -o GaiaRepairTask $(GAIAGSRRepairTask) $(LIB)
clean: clean:
rm -f *.o core rm -f *.o core
Makefile.marconi_new deleted 100644 → 0
+ 0
− 38
View file @ 8598150d
# Gaia GSRPar Makefile
COMPILER = mpiicpc -qopenmp -DOMP
COMPILERCPP = mpiicpc -qopenmp -DOMP
CC = $(COMPILER)
CPP= $(COMPILERCPP)
CFITSIOLIB=$(CFITSIO_LIB)
GAIAINC=.
GAIAGSRSIM= aprod.o lsqrblas.o lsqr.o solvergaiaSim.o util.o
MEMREQ= memRequest.o
##INCLUDE = -I$(GAIAINC) -I/opt/local/include -I/opt/local/include/mpich2 -I/opt/cluster/cfitsio/intel/2017.1/include/
INCLUDE = -I$(GAIAINC) -I$(CFITSIO_INC)
#INCLUDE = -I$(GAIAINC)
#CFLAGS= $(INCLUDE) -std=c99
#CPPFLAGS= $(INCLUDE) -g -fsanitize=address -mllvm -asan-stack
#CPPFLAGS= $(INCLUDE) -lirc -limf -lsvml
CPPFLAGS= $(INCLUDE) -DOMP=
LIB = -L$(CFITSIOLIB) -lcfitsio -lm
all: GaiaGsrParSim
###all: GaiaGsrPar MemReq GaiaGsrParTest GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced
GaiaGsrParSim: $(GAIAGSRSIM)
$(CPP) $(CPPFLAGS) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB)
MemReq: $(MEMREQ)
$(CPP) $(CPPFLAGS) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB)
clean:
rm -f *.o core
Makefile_marconi deleted 100644 → 0
+ 0
− 81
View file @ 8598150d
# Gaia GSRPar Makefile
##COMPILER = mpiicpc -g -traceback -O3 -qopenmp
##COMPILERCPP = mpiicpc -g -traceback -O3 -qopenmp
COMPILER = mpiicpc -O3 -qopenmp
COMPILERCPP = mpiicpc -O3 -qopenmp
CC = $(COMPILER)
CPP = $(COMPILERCPP)
# CFITSIOLIB=/opt/cfitsio/lib
#CFITSIOLIB=/cineca/prod/opt/libraries/cfitsio/3.390/intel--pe-xe-2016--binary/lib/
CFITSIOLIB=$(CFITSIO_LIB)
GAIAINC=.
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/cfitsio/include
#INCLUDE = -I$(GAIAINC) -I/cineca/prod/opt/libraries/cfitsio/3.390/intel--pe-xe-2016--binary/include/
INCLUDE = -I$(GAIAINC) -I$(CFITSIO_INC)
CPPFLAGS= $(INCLUDE) -DOMP=
LIB = -L$(CFITSIOLIB) -lcfitsio -lm
all: GaiaGsrPar MemReq GaiaGsrParSim GaiaFits2Bin GaiaBin2Fits GaiaBin2Reduced GaiaCkEmptyCols GaiaBin2Asc GaiaChTask GaiaRepTask
###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) -o GaiaGsrPar $(GAIAGSR) $(INCLUDE) $(LIB)
MemReq: $(MEMREQ)
$(CPP) -o MemReq $(MEMREQ) $(INCLUDE) $(LIB)
GaiaGsrParSim: $(GAIAGSRSIM)
$(CPP) -o GaiaGsrParSim $(GAIAGSRSIM) $(INCLUDE) $(LIB)
GaiaFits2Bin: $(GAIAGSRFits2Bin)
$(CPP) -o GaiaFits2Bin $(GAIAGSRFits2Bin) $(INCLUDE) $(LIB)
GaiaBin2Fits: $(GAIAGSRBin2Fits)
$(CPP) -o GaiaBin2Fits $(GAIAGSRBin2Fits) $(INCLUDE) $(LIB)
GaiaBin2Reduced: $(GAIAGSRBin2Reduced)
$(CPP) -o GaiaBin2Reduced $(GAIAGSRBin2Reduced) $(INCLUDE) $(LIB)
GaiaBin2Asc: $(GAIAGSRBin2Asc)
$(CPP) -o GaiaBin2Asc $(GAIAGSRBin2Asc) $(INCLUDE) $(LIB)
GaiaChTask: $(GAIAGSRChTask)
$(CPP) -o GaiaChTask $(GAIAGSRChTask) $(LIB)
GaiaCkEmptyCols: $(GAIAGSRCkEmptyCols)
$(CPP) -o GaiaCkEmptyCols $(GAIAGSRCkEmptyCols) $(LIB)
GaiaRepTask: $(GAIAGSRRepairTask)
$(CPP) $(CPPFLAGS) -o GaiaRepairTask $(GAIAGSRRepairTask) $(LIB)
clean:
rm -f *.o core
a deleted 100644 → 0
+ 0
− 1
View file @ 8598150d
scp *.c *.cpp *.h ubecciani@ssh.hca.bsc.es:/home/ubecciani/AVU-GSR/OMP/src/
aprod.c
+ 426
− 692
View file @ f4fec858
This diff is collapsed.
lsqr.c
+ 1197
− 1314
View file @ f4fec858
This diff is collapsed.
memRequest.c 100644 → 100755
+ 0
− 0
View file @ f4fec858
File mode changed from 100644 to 100755
run_ppl.cmd 0 → 100755
+ 28
− 0
View file @ f4fec858
#!/bin/bash
#SBATCH --job-name=AVUGSR_OMP
#SBATCH --time=0:30:00
#SBATCH --out=out.log
#SBATCH --err=err.log
###SBATCH --nodes=2 --ntasks-per-node=2 --ntasks-per-socket=2
#SBATCH --nodes=1
#SBATCH --ntasks=2
#SBATCH --cpus-per-task=4
#SBATCH --mem=100000
#SBATCH --partition=merlin
####SBATCH --account=INAF_GAIA14_3
#
#
#
###module load profile/astro
##module load autoload intelmpi cfitsio
export OMP_NUM_THREADS=4
export KMP_AFFINITY=compact
#
cd /home/ubecciani/AVU-GSR/OMP/src/run
srun ../GaiaGsrParSim -auto
exit 0
#
#
solvergaiaSim.c
+ 2194
− 2575
View file @ f4fec858
This diff is collapsed.
util.c 100644 → 100755
+ 0
− 0
View file @ f4fec858
File mode changed from 100644 to 100755
util.h 100644 → 100755
+ 0
− 1
View file @ f4fec858
...@@ -103,7 +103,6 @@ struct comData { ...@@ -103,7 +103,6 @@ struct comData {
long offsetCMag,offsetCnu,offsetCdelta_eta,offsetCDelta_eta_1,offsetCDelta_eta_2; long offsetCMag,offsetCnu,offsetCdelta_eta,offsetCDelta_eta_1,offsetCDelta_eta_2;
long offsetCDelta_eta_3,offsetCdelta_zeta,offsetCDelta_zeta_1,offsetCDelta_zeta_2; long offsetCDelta_eta_3,offsetCdelta_zeta,offsetCDelta_zeta_1,offsetCDelta_zeta_2;
int nthreads; int nthreads;
int ntasks;
long **mapForThread; long **mapForThread;
int nSubsetAtt, nSubsetInstr; int nSubsetAtt, nSubsetInstr;
int NOnSubsetAtt, NOnSubsetInstr; int NOnSubsetAtt, NOnSubsetInstr;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment