Browse Source

Improved support for local Makefiles.

Macros and the CUDA architecture can now be stored in the 'Makefile.local'.
Steven Engler 8 years ago
parent
commit
0ec3f2b5b8
1 changed files with 5 additions and 3 deletions
  1. 5 3
      Makefile

+ 5 - 3
Makefile

@@ -17,6 +17,8 @@
 
 
 -include Makefile.local
 -include Makefile.local
 
 
+CUDA_ARCH ?= sm_30
+
 GMP ?= /usr/local
 GMP ?= /usr/local
 NTL ?=
 NTL ?=
 CUDA ?= /usr/local/cuda
 CUDA ?= /usr/local/cuda
@@ -40,12 +42,12 @@ MPI_LIB = $(if $(strip $(MPI)), -L$(MPI)/lib)
 MPI_INC = $(if $(strip $(MPI)), -I$(MPI)/include)
 MPI_INC = $(if $(strip $(MPI)), -I$(MPI)/include)
 
 
 WORDS = 24
 WORDS = 24
-MACROS=-UVERBOSE
-# options: VERBOSE DERANDOMIZE SAVE_DPS MAKE_VERSIONS_COMPARABLE
+MACROS := -UVERBOSE $(MACROS)
+# options: VERBOSE DERANDOMIZE SAVE_DPS MAKE_VERSIONS_COMPARABLE RIPPLE GRAHAM
 
 
 CXXFLAGS=-g -Wall -O2
 CXXFLAGS=-g -Wall -O2
 CPPFLAGS=-DWORDS=$(WORDS) $(LIBEVENT_INC) $(GMP_INC) $(NTL_INC) -std=c++11 $(MACROS)
 CPPFLAGS=-DWORDS=$(WORDS) $(LIBEVENT_INC) $(GMP_INC) $(NTL_INC) -std=c++11 $(MACROS)
-NVCCOPTS=-g -arch sm_30 --ptxas-options=-v -O2
+NVCCOPTS=-g -arch $(CUDA_ARCH) --ptxas-options=-v -O2
 NVCC=nvcc $(NVCCOPTS)
 NVCC=nvcc $(NVCCOPTS)
 
 
 CXXFILES = dlrho.cc gen_N.cc
 CXXFILES = dlrho.cc gen_N.cc