Преглед изворни кода

Added support for NTL 11.1.0

Upgraded from C++98 (gcc default in versions <6.1) to C++11. Also had to link with pthread due to NTL's support for thread safety.
Steven Engler пре 8 година
родитељ
комит
f48b533ae4
1 измењених фајлова са 7 додато и 7 уклоњено
  1. 7 7
      Makefile

+ 7 - 7
Makefile

@@ -26,7 +26,7 @@ CXX ?= g++
 WORDS = 24
 
 CXXFLAGS=-g -Wall -O2
-CPPFLAGS=-DWORDS=$(WORDS) -I$(LIBEVENT)/include -I$(GMP)/include -UVERBOSE
+CPPFLAGS=-DWORDS=$(WORDS) -I$(LIBEVENT)/include -I$(GMP)/include -UVERBOSE -std=c++11
 NVCCOPTS=-g -arch sm_30 --ptxas-options=-v -O2
 NVCC=nvcc $(NVCCOPTS)
 
@@ -44,10 +44,10 @@ nompi: $(NOMPI_TARGETS)
 ptx: $(PTX_TARGETS)
 
 gen_N: gen_N.o
-	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp
+	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp -lpthread
 
 dlrho: dlrho.o cudadl.o
-	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart
+	g++ -g -Wall $^ -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart -lpthread
 
 dlrho.o: dlrho.cc
 	g++ $(CXXFLAGS) $(CPPFLAGS) -I$(CUDA)/include $^ -c -o $@
@@ -59,16 +59,16 @@ cudadl.o: parrhoasm.cu cios.asm dpstream.cu
 	$(NVCC) $(CPPFLAGS) -c $< -o $@
 
 test_cuda: parrhoasm.cu cios.asm dpstream.cu
-	$(NVCC) -DTEST_CUDA $(CPPFLAGS) $< -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart
+	$(NVCC) -DTEST_CUDA $(CPPFLAGS) $< -o $@ -lntl -L$(GMP)/lib -lgmp -L$(CUDA)/lib64 -lcudart -lpthread
 
 cios.asm: gencios_reg_20
 	./gencios_reg_20 $(WORDS) > $@
 
 controller: controller.o evutils.o controller_main.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp
+	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp -lpthread
 
 dpnode: dpnode.o evutils.o dpnode_main.o
-	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp
+	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -lntl -L$(GMP) -lgmp -lpthread
 
 worker: worker.o evutils.o cudadl.o worker_main.o
 	g++ -g -Wall $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -levent -levent_pthreads -lntl -L$(GMP) -lgmp -lpthread -L$(CUDA)/lib64 -lcudart
@@ -77,7 +77,7 @@ worker.o: worker.cc
 	g++ $(CXXFLAGS) $(CPPFLAGS) -I$(CUDA)/include $^ -c -o $@
 
 desres: controller_main.cc
-	g++ $(CXXFLAGS) $(CPPFLAGS) -DTEST_DESIRED_RESOURCES $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -lntl -lgmp
+	g++ $(CXXFLAGS) $(CPPFLAGS) -DTEST_DESIRED_RESOURCES $^ -o $@ -L$(LIBEVENT)/lib -Wl,-rpath=$(LIBEVENT)/lib -lntl -lgmp -lpthread
 
 mpi: mpi.o
 	mpiCC -g -Wall $^ -o $@ -L/work/iang/sw/lib -lntl -L$(GMP) -lgmp -lpthread