From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C442138359 for ; Fri, 7 Aug 2020 12:56:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E213E0806; Fri, 7 Aug 2020 12:56:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38155E0806 for ; Fri, 7 Aug 2020 12:56:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC53F34F02A for ; Fri, 7 Aug 2020 12:56:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68F4E239 for ; Fri, 7 Aug 2020 12:56:03 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1596804958.a788dbf0de374240b116598b7a93881509258e24.heroxbd@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch sci-libs/pytorch/pytorch-1.6.0.ebuild X-VCS-Directories: sci-libs/pytorch/ sci-libs/pytorch/files/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: a788dbf0de374240b116598b7a93881509258e24 X-VCS-Branch: master Date: Fri, 7 Aug 2020 12:56:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b34449fc-ba3c-4717-818e-6d2f6e2a4411 X-Archives-Hash: 10b65ea5c4ab0e99302225cb25f333ce commit: a788dbf0de374240b116598b7a93881509258e24 Author: Benda Xu gentoo org> AuthorDate: Fri Aug 7 12:55:50 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Fri Aug 7 12:55:58 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a788dbf0 sci-libs/pytorch: refresh cuda nccl patch for 1.6.0. Package-Manager: Portage-2.3.88, Repoman-2.3.18 Signed-off-by: Benda Xu gentoo.org> .../files/pytorch-1.6.0-nccl-nvccflags.patch | 27 ++++++++++++++++++++++ sci-libs/pytorch/pytorch-1.6.0.ebuild | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch b/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch new file mode 100644 index 000000000..052474ee4 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch @@ -0,0 +1,27 @@ +diff -uprN nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk nccl-patched/makefiles/common.mk +--- nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk 2020-06-09 00:31:44.000000000 +0800 ++++ nccl-patched/makefiles/common.mk 2020-08-06 21:25:57.784279738 +0800 +@@ -54,7 +54,7 @@ CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR) + # Maxrregcount needs to be set accordingly to NCCL_MAX_NTHREADS (otherwise it will cause kernel launch errors) + # 512 : 120, 640 : 96, 768 : 80, 1024 : 60 + # We would not have to set this if we used __launch_bounds__, but this only works on kernels, not on functions. +-NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all ++NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all + # Use addprefix so that we can specify more than one path + NVLDFLAGS := -L${CUDA_LIB} -lcudart -lrt + +@@ -68,14 +68,6 @@ NVLDFLAGS += ${GCOV_FLAGS:%=-Xcompiler + # $(warning GCOV_FLAGS=${GCOV_FLAGS}) + ########## GCOV ########## + +-ifeq ($(DEBUG), 0) +-NVCUFLAGS += -O3 +-CXXFLAGS += -O3 -g +-else +-NVCUFLAGS += -O0 -G -g +-CXXFLAGS += -O0 -g -ggdb3 +-endif +- + ifneq ($(VERBOSE), 0) + NVCUFLAGS += -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter + CXXFLAGS += -Wall -Wextra diff --git a/sci-libs/pytorch/pytorch-1.6.0.ebuild b/sci-libs/pytorch/pytorch-1.6.0.ebuild index c59b248e2..1394bdbe3 100644 --- a/sci-libs/pytorch/pytorch-1.6.0.ebuild +++ b/sci-libs/pytorch/pytorch-1.6.0.ebuild @@ -147,7 +147,7 @@ src_prepare() { if use cuda; then cd ../nccl || die - eapply "${FILESDIR}"/${PN}-1.4.0-nccl-nvccflags.patch + eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch ln -s . nccl || die cuda_src_prepare