Updated submodules;
changed CUDAHOME to CUDA_HOME; bumped default GPUARCH to sm_80
This commit is contained in:
parent
6778462e14
commit
101f19fac6
7 changed files with 12 additions and 10 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
run*
|
||||||
|
settings.json
|
||||||
8
Makefile
8
Makefile
|
|
@ -5,16 +5,16 @@
|
||||||
RUNDIR ?= run
|
RUNDIR ?= run
|
||||||
ETICS_LMAX ?= 2
|
ETICS_LMAX ?= 2
|
||||||
ETICS_NMAX ?= 10
|
ETICS_NMAX ?= 10
|
||||||
GPUARCH ?= sm_75
|
GPUARCH ?= sm_80
|
||||||
CUDAHOME ?= /usr/local/cuda
|
CUDA_HOME ?= /usr/local/cuda
|
||||||
MPIHOME ?= /home/meiron/local
|
MPI_HOME ?= /home/meiron/local
|
||||||
OPTIMIZATION ?= 3
|
OPTIMIZATION ?= 3
|
||||||
CXXFLAGS += $(CFLAGS)
|
CXXFLAGS += $(CFLAGS)
|
||||||
CUDAFLAGS ?=
|
CUDAFLAGS ?=
|
||||||
|
|
||||||
CXX ?= g++
|
CXX ?= g++
|
||||||
MPICC ?= mpicc
|
MPICC ?= mpicc
|
||||||
NVCC ?= $(CUDAHOME)/bin/nvcc
|
NVCC ?= $(CUDA_HOME)/bin/nvcc -ccbin=$(CXX)
|
||||||
|
|
||||||
export
|
export
|
||||||
|
|
||||||
|
|
|
||||||
2
etics
2
etics
|
|
@ -1 +1 @@
|
||||||
Subproject commit b12ed6130078f9bc020df88b5007d21d937d13c9
|
Subproject commit c22bb6340c13b760e399b46c6b5746220f7f3640
|
||||||
2
grapite
2
grapite
|
|
@ -1 +1 @@
|
||||||
Subproject commit aa58cd9b21892ece6729fbdf9062746286ae2374
|
Subproject commit ee61f453267a1e69793a94258c8a317ca630aa0d
|
||||||
2
phigrape
2
phigrape
|
|
@ -1 +1 @@
|
||||||
Subproject commit 0a2344563d4916a0947f4da7f661a5206ace098e
|
Subproject commit 064eb4e3c594b57a2c5a35d4ac119ed79bb6eefd
|
||||||
|
|
@ -103,8 +103,8 @@ diff -ruN
|
||||||
.SUFFIXES: .o .cpp .ptx .cu
|
.SUFFIXES: .o .cpp .ptx .cu
|
||||||
|
|
||||||
-CUDA_TK ?= /usr/local/cuda
|
-CUDA_TK ?= /usr/local/cuda
|
||||||
+CUDAHOME ?= /usr/local/cuda
|
+CUDA_HOME ?= /usr/local/cuda
|
||||||
+CUDA_TK = $(CUDAHOME)
|
+CUDA_TK = $(CUDA_HOME)
|
||||||
+OPTIMIZATION ?= 3
|
+OPTIMIZATION ?= 3
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
2
yebisu
2
yebisu
|
|
@ -1 +1 @@
|
||||||
Subproject commit 604f1cb18abfc8e72d858d8922fa5176c6dba636
|
Subproject commit ab99a3d8f51eb1081bbbb45d58673fef128f880e
|
||||||
Loading…
Add table
Add a link
Reference in a new issue