Commit 64adac63 authored by Claudio Gheller's avatar Claudio Gheller
Browse files

merge with openmp branch WITHOUT ACCOMP directives

parents 477b8f6a 668da3ac

.gitignore

+2 −0
Original line number Diff line number Diff line 
*.o

.DS_Store 

sync.sh

phase_correction.c

w-stacking.c

w-stackingCfftw

Build/Makefile.M100

0 → 100644
+20 −0
Original line number Diff line number Diff line 
CC       =  gcc

CXX      =  g++



MPICC    =  mpicc

MPIC++   =  mpiCC





#FFTW_INCL=  -I/home/taffoni/sw/include

#FFTW_LIB=  -L/home/taffoni/sw/lib





NVCC = nvcc

NVFLAGS = -arch=sm_70 -Xcompiler -mno-float128 -std=c++11

NVLIB = -L/cineca/prod/opt/compilers/cuda/10.1/none/lib64/ -lcudart -lcuda



OMP= -fopenmp



CFLAGS +=  -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)



OPTIMIZE = $(OMP) -O3 -mtune=native

Build/Makefile.Macosx

0 → 100644
+26 −0
Original line number Diff line number Diff line 
CC       =  icc

CXX      =  g++-11



MPICC    =  mpicc

MPIC++   =  mpiCC



FFTW_INCL=  -I/usr/local/include

FFTW_LIB=  /usr/local/lib/



GSL_INCL =

GSL_LIBS =



MPI_LIB =

MPI_INCL= -I/home/taffoni/sw/Linux_x86_64/21.5/comm_libs/mpi/include

HDF5_INCL =

HDF5_LIB  =



OMP= -fopenmp



NVCC = nvcc

NVFLAGS = -arch=sm_70 -Xcompiler -mno-float128 -std=c++11

NVLIB = -L/home/taffoni -lcudart -lcuda



CFLAGS +=  -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)



OPTIMIZE = $(OMP) -O3

Build/Makefile.Magellanus

0 → 100644
+34 −0
Original line number Diff line number Diff line 
CC       =  gcc-10

CXX      =  g++-10



MPICC    =  mpicc

MPIC++   =  mpiCC



GSL_INCL =  -I/home/taffoni/sw/include

GSL_LIBS =  -L/home/taffoni/sw/lib



FFTW_INCL=  -I/home/taffoni/sw/include

FFTW_LIB=  /home/taffoni/sw/lib   -lfftw3_mpi -lfftw3



#-L/opt/cluster/openmpi/3.1.3/gnu/8.2.0/lib -lmpi

MPI_LIB =

#-I/opt/cluster/openmpi/3.1.3/gnu/8.2.0/include

MPI_INCL= -I/home/taffoni/sw/Linux_x86_64/21.5/comm_libs/mpi/include

HDF5_INCL =

HDF5_LIB  =



OMP = -mp=multicore,gpu -Mprof -cuda

#OMP = -fopenmp

NVCC = nvcc

NVFLAGS = -arch=sm_70 -Xcompiler -std=c++11

NVLIB = -L/home/taffoni/sw/Linux_x86_64/21.5/cuda/11.3/lib64/ -lcudart -lcuda





CFLAGS +=  -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)



OPTIMIZE =  $(OMP) -O3



# OMP GPU SPECIFIC FLAGS

#OPTIMIZE += -Wno-unused-result -foffload=-lm -ffast-math

#OPTIMIZE += -fcf-protection=none -fno-stack-protector -foffload=nvptx-none -foffload=-misa=sm_35

#-ffast-math  -fopt-info-all-omp -foffload=-misa=sm_35 -fcf-protection=none -fno-stack-protector -foffload=nvptx-none

Build/Makefile.Marconi

0 → 100644
+20 −0
Original line number Diff line number Diff line 
CC       =  gcc

CXX      =  g++



MPICC    =  mpicc

MPIC++   =  mpiCC





FFTW_INCL=  -I/home/taffoni/sw/include

FFTW_LIB=  /home/taffoni/sw/lib





NVCC = nvcc

NVFLAGS = -arch=sm_70 -Xcompiler -mno-float128 -std=c++11

NVLIB = -L/cineca/prod/opt/compilers/cuda/10.1/none/lib64/ -lcudart -lcuda



OMP= -fopenmp



CFLAGS +=  -I. $(FFTW_INCL) $(GSL_INCL) $(MPI_INCL)



OPTIMIZE = $(OMP) -O3 -mtune=native