From 4d9188a818fb3cda779ca6b2105700237901bd1b Mon Sep 17 00:00:00 2001 From: Boris Fomitchev Date: Mon, 13 Jun 2016 02:35:30 -0700 Subject: Preparing for 1.2.3 rebuild --- Makefile | 4 +++- debian/changelog | 12 +++++++++--- debian/control | 6 +++--- debian/gbp.conf | 9 +++++++++ debian/shlibs.local | 2 +- scripts/build-package.sh | 2 +- 6 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 debian/gbp.conf diff --git a/Makefile b/Makefile index 6cd8bfb..85814a8 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,9 @@ NVCC ?= $(CUDA_HOME)/bin/nvcc NVCC_GENCODE ?= -gencode=arch=compute_35,code=sm_35 \ -gencode=arch=compute_50,code=sm_50 \ -gencode=arch=compute_52,code=sm_52 \ - -gencode=arch=compute_52,code=compute_52 + -gencode=arch=compute_60,code=sm_60 \ + -gencode=arch=compute_61,code=sm_61 \ + -gencode=arch=compute_61,code=compute_61 CXXFLAGS := -I$(CUDA_INC) -fPIC -fvisibility=hidden NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -lineinfo -std=c++11 -maxrregcount 96 diff --git a/debian/changelog b/debian/changelog index 84060d7..f85f183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nccl (1.2.3-1+cuda7.5) trusty; urgency=medium +nccl (1.2.3-1+cuda8.0) trusty; urgency=medium * Make NCCL collectives work on communicators with only one rank * Changed CURAND generator to work on a wider set of platforms. @@ -6,14 +6,20 @@ nccl (1.2.3-1+cuda7.5) trusty; urgency=medium -- Sylvain Jeaugey Mon, 13 Jun 2016 1:45:01 -0800 -nccl (1.2.2-1+cuda7.5) trusty; urgency=medium +nccl (1.2.2-1+cuda8.0) trusty; urgency=medium * Gencodes changed to NV recommended * Minor Makefile changes -- Boris Fomitchev Mon, 06 Jun 2016 1:07:01 -0800 -nccl (1.2.1-1+cuda7.5) trusty; urgency=medium +nccl (1.2.1-1+cuda8.0) trusty; urgency=medium + + * Merged public bugfixes + + -- Boris Fomitchev Thu, 21 Apr 2016 17:07:01 -0800 + +nccl (1.1.1-1+cuda8.0) trusty; urgency=medium * Merged public bugfixes diff --git a/debian/control b/debian/control index 1581ec1..3941f37 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,15 @@ Source: nccl Section: universe/libs Maintainer: Boris Fomitchev Priority: optional -Build-depends: debhelper(>=9), cuda-core-7-5, cuda-toolkit-7-5, - cuda-curand-dev-7-5, cuda-cublas-dev-7-5, cuda-cudart-dev-7-5, cuda-ld-conf-7-5 +Build-depends: debhelper(>=9), cuda-core-8-0, cuda-toolkit-8-0, + cuda-curand-dev-8-0, cuda-cublas-dev-8-0, cuda-cudart-dev-8-0 Standards-Version: 3.9.5 Package: libnccl1 Section: universe/libs Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, - cuda-curand-7-5, cuda-cublas-7-5, cuda-cudart-7-5, cuda-ld-conf-7-5 + cuda-curand-8-0, cuda-cublas-8-0, cuda-cudart-8-0 Description: NVIDIA Communication Collectives Library (NCCL) Runtime NCCL (pronounced "Nickel") is a stand-alone library of standard collective communication routines,such as all-gather, reduce, broadcast, etc., that have diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..c3cfc09 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,9 @@ +[DEFAULT] +debian-branch = 8.0 +upstream-branch = 8.0 + +ignore-new = True + +[git-buildpackage] + +no-purge = True diff --git a/debian/shlibs.local b/debian/shlibs.local index 12eb04d..e216ff1 100644 --- a/debian/shlibs.local +++ b/debian/shlibs.local @@ -1 +1 @@ -libcudart 7.5 cuda-cudart-7-5 +libcudart 8.0 cuda-cudart-8-0 diff --git a/scripts/build-package.sh b/scripts/build-package.sh index b55d17a..428da45 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -7,4 +7,4 @@ git commit -a -m 'Preparing for pbuild' # && git push git clean -f -gbp buildpackage --git-pbuilder --git-dist=nvidia-7-5 $1 $2 $3 $4 $5 +gbp buildpackage --git-pbuilder --git-dist=nvidia-8-0 $1 $2 $3 $4 $5 -- cgit v1.2.3