Skip to content

Commit

Permalink
Fixing the makefile for newer cuda/gcc
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewboktor committed Feb 13, 2015
1 parent 1716296 commit a448d75
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions WP/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ DEBUGOUTPUT = -DDEBUG_I=$(DEBUG_I) -DDEBUG_J=$(DEBUG_J) -DDEBUG_K=$(DEBUG_K) $(F
NVCC = $(CUDA_INSTALL_PATH)/bin/nvcc -DCUDA #--ptxas-options=-v
PHASE = -cuda --compiler-options -fno-strict-aliasing
NVOPT = $(DEVICEEMU_NVCC) $(PROMOTE) $(DEBUGDEBUG) $(DEBUGOUTPUT) \
-DXXX=$(XXX) -DYYY=$(YYY) -DMKX=$(MKX) --host-compilation 'C++' --use_fast_math
-DXXX=$(XXX) -DYYY=$(YYY) -DMKX=$(MKX) --use_fast_math
ifeq ($(noinline),1)
NVOPT += -Xopencc -noinline
# Compiler-specific flags, when using noinline, we don't build for SM1x
Expand Down Expand Up @@ -108,15 +108,15 @@ wsm5.f.cu : wsm5.cu

wsm5.cu.o : wsm5.f.cu
$(NVCC) $(PHASE) $(NVOPT) wsm5.f.cu
$(CC) $(CFLAGS) -o wsm5.cu.o -c wsm5.f.cu.cpp
$(CC) $(CFLAGS) -o wsm5.cu.o -c wsm5.f.cu.cpp.ii


wsm5_gpu.f.cu : wsm5_gpu.cu spt.h
m4 wsm5_gpu.cu | ./spt.pl | sed "s/float/$(FLOAT)/g" > wsm5_gpu.f.cu

wsm5_gpu.cu.o : wsm5_gpu.f.cu
$(NVCC) $(PHASE) $(NVOPT) wsm5_gpu.f.cu
$(CC) $(CFLAGS) -o wsm5_gpu.cu.o -c wsm5_gpu.f.cu.cpp
$(CC) $(CFLAGS) -o wsm5_gpu.cu.o -c wsm5_gpu.f.cu.cpp.ii


libmassv.o : libmassv.F
Expand Down

2 comments on commit a448d75

@tgrogers
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this still work with the old versions of GCC and CUDA?

@andrewboktor
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tried. Eitherway submitting a pull request is a good idea even if we let it dangle in case someone else has the same problem.

Please sign in to comment.