Skip to content
Snippets Groups Projects
Commit f43f86ed authored by Claudio Gheller's avatar Claudio Gheller
Browse files

Bug fix

parent 99ac8a60
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 9 additions and 7 deletions
Makefile
+ 9
− 7
View file @ f43f86ed
...@@ -14,11 +14,13 @@ OPT += -DWRITE_IMAGE ...@@ -14,11 +14,13 @@ OPT += -DWRITE_IMAGE
CC = gcc CC = gcc
CXX = g++ CXX = g++
MPICC = mpicc ifeq (USE_MPI,$(findstring USE_MPI,$(OPT)))
MPICXX = mpiCC CC = mpicc
CXX = mpiCC
endif
#OMP = -fopenmp OMP = -fopenmp
OMP = #OMP =
CFLAGS += -O3 -mcpu=native CFLAGS += -O3 -mcpu=native
CFLAGS += -I. CFLAGS += -I.
...@@ -49,12 +51,12 @@ serial_cuda: ...@@ -49,12 +51,12 @@ serial_cuda:
$(CXX) $(CFLAGS) $(OPT) -o w-stackingfftw_serial w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) -lm $(CXX) $(CFLAGS) $(OPT) -o w-stackingfftw_serial w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) -lm
mpi: $(COBJ) mpi: $(COBJ)
$(MPICC) $(OMP) -o w-stackingCfftw $(CFLAGS) $^ $(LIBS) $(CC) $(OMP) -o w-stackingCfftw $(CFLAGS) $^ $(LIBS)
mpi_cuda: mpi_cuda:
$(NVCC) $(NVFLAGS) -c w-stacking.cu phase_correction.cu $(NVLIB) $(NVCC) $(NVFLAGS) -c w-stacking.cu phase_correction.cu $(NVLIB)
$(MPICC) $(CFLAGS) $(OPT) -c w-stacking-fftw.c $(CC) $(CFLAGS) $(OPT) -c w-stacking-fftw.c
$(MPICXX) $(CFLAGS) $(OPT) -o w-stackingfftw w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) $(LIBS) -lm $(CXX) $(CFLAGS) $(OPT) -o w-stackingfftw w-stacking-fftw.o w-stacking.o phase_correction.o $(NVLIB) $(LIBS) -lm
clean: clean:
rm *.o rm *.o
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment