Commit c787278c authored by Claudio Gheller's avatar Claudio Gheller
Browse files

error fixed in Makefile and updated version of inverse-imaging.c added. The... 

error fixed in Makefile and updated version of inverse-imaging.c added. The latter compiles but it is not complete yet
parent b0ce573b

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ w-stackingfftw 
w-stackingCfftw_serial

w-stackingfftw_serial

inverse-imaging

.*

Build/Makefile.M100

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 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

OMP= #-fopenmp



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

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ endif 
# perform one-side communication (suggested) instead of reduce (only if MPI is active)

OPT += -DONE_SIDE

# write the full 3D cube of gridded visibilities and its FFT transform

#OPT += -DWRITE_DATA

OPT += -DWRITE_DATA

# write the final image

OPT += -DWRITE_IMAGE

# perform w-stacking phase correction
@@ -71,8 +71,8 @@ serial_cuda: 
	$(CXX) $(OPTIMIZE) $(OPT) -o w-stackingfftw_serial w-stacking-fftw.o w-stacking.o phase_correction.o $(CFLAGS) $(NVLIB) -lm



mpi: $(COBJ)

	$(MPICC) $(OPTIMIZE) -o w-stackingCfftw   $^  $(CFLAGS) $(LIBS)

	$(MPICC) $(OPTIMIZE) -o inverse-imaging inverse-imaging.c w-stacking.c $(CFLAGS) $(LIBS)

	$(MPICC) $(OPTIMIZE) $(OPT) -o w-stackingCfftw   $^  $(CFLAGS) $(LIBS)

	$(MPICC) $(OPTIMIZE) $(OPT) -o inverse-imaging inverse-imaging.c w-stacking.c $(CFLAGS) $(LIBS)



mpi_cuda:

	$(NVCC)   $(NVFLAGS) -c w-stacking.cu phase_correction.cu $(NVLIB)

inverse-imaging.c

+275 −460

File changed.

Preview size limit exceeded, changes collapsed.