yezhengmao/nccl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into HEAD

Browse Source
This commit is contained in:
Sylvain Jeaugey 2016-06-06 14:35:57 -07:00
commit 620491a649
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -38,7 +38,8 @@ NVCC ?= $(CUDA_HOME)/bin/nvcc
NVCC_GENCODE ?= -gencode=arch=compute_35,code=sm_35 \ NVCC_GENCODE ?= -gencode=arch=compute_35,code=sm_35 \
-gencode=arch=compute_50,code=sm_50 \ -gencode=arch=compute_50,code=sm_50 \
-gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_52,code=sm_52 \
-gencode=arch=compute_52,code=compute_52
CXXFLAGS := -I$(CUDA_INC) -fPIC -fvisibility=hidden CXXFLAGS := -I$(CUDA_INC) -fPIC -fvisibility=hidden
NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -lineinfo -std=c++11 -maxrregcount 96 NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -lineinfo -std=c++11 -maxrregcount 96
@ -146,7 +147,7 @@ MPITESTBINS:= $(patsubst %, $(MPITSTDIR)/%, $(MPITESTS))
test : $(TESTBINS) test : $(TESTBINS)
$(TSTDIR)/% : test/single/%.cu $(TSTDEP) $(TSTDIR)/% : test/single/%.cu $(TSTDEP)
@printf "Building %-25s > %-24s\n" $< $@ @printf "Building %-25s > %-24s\n" $< $@
mkdir -p $(TSTDIR) mkdir -p $(TSTDIR)
$(NVCC) $(TSTINC) $(NVCUFLAGS) --compiler-options "$(CXXFLAGS)" -o $@ $< $(TSTLIB) -lcuda -lcurand -lnvToolsExt $(NVCC) $(TSTINC) $(NVCUFLAGS) --compiler-options "$(CXXFLAGS)" -o $@ $< $(TSTLIB) -lcuda -lcurand -lnvToolsExt
@ -158,7 +159,7 @@ $(TSTDIR)/% : test/single/%.cu $(TSTDEP)
mpitest : $(MPITESTBINS) mpitest : $(MPITESTBINS)
$(MPITSTDIR)/% : test/mpi/%.cu $(TSTDEP) $(MPITSTDIR)/% : test/mpi/%.cu $(TSTDEP)
@printf "Building %-25s > %-24s\n" $< $@ @printf "Building %-25s > %-24s\n" $< $@
mkdir -p $(MPITSTDIR) mkdir -p $(MPITSTDIR)
$(NVCC) $(MPIFLAGS) $(TSTINC) $(NVCUFLAGS) --compiler-options "$(CXXFLAGS)" -o $@ $< $(TSTLIB) -lcurand $(NVCC) $(MPIFLAGS) $(TSTINC) $(NVCUFLAGS) --compiler-options "$(CXXFLAGS)" -o $@ $< $(TSTLIB) -lcurand

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
nccl (1.2.2-1+cuda7.5) trusty; urgency=medium
* Gencodes changed to NV recommended
* Minor Makefile changes
-- Boris Fomitchev <bfomitchev@nvidia.com> Mon, 06 Jun 2016 1:07:01 -0800
nccl (1.2.1-1+cuda7.5) trusty; urgency=medium nccl (1.2.1-1+cuda7.5) trusty; urgency=medium
* Merged public bugfixes * Merged public bugfixes

2
debian/libnccl1.install vendored
View File

@ -1,2 +1,2 @@
lib/libnccl.so.1 /usr/lib/x86_64-linux-gnu lib/libnccl.so.1 /usr/lib/x86_64-linux-gnu
lib/libnccl.so.1.2.1 /usr/lib/x86_64-linux-gnu lib/libnccl.so.1.2.2 /usr/lib/x86_64-linux-gnu