From 2662fca159e6798c216710f5ae563439653ed27a Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Sun, 3 Sep 2017 12:40:24 -0300 Subject: [PATCH] Removed NCCL support (it can be enabled by uncommenting the proper lines) The newly released NCCL version 2 requires registration at the NVIDIA developer webiste and a manual download. As this breaks automated builds by AUR helpers, NCCL was disabled by default in this package. It can still be enabled by uncommenting the proper lines in the PKGBUILD file (instructions are at the top of the PKGBUILD file). --- .SRCINFO | 5 ++--- PKGBUILD | 12 ++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d41fc3d..56e5efd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Aug 6 13:20:29 UTC 2017 +# Sun Sep 3 15:40:18 UTC 2017 pkgbase = caffe pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (gpu enabled) pkgver = 1.0 - pkgrel = 5 + pkgrel = 6 url = http://caffe.berkeleyvision.org/ arch = x86_64 license = BSD @@ -38,7 +38,6 @@ pkgbase = caffe depends = python-pillow depends = python-six depends = openblas-lapack - depends = nccl depends = python-leveldb depends = python-scikit-image depends = python-pydotplus diff --git a/PKGBUILD b/PKGBUILD index 183cb13..492d2b4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,13 @@ # Maintainer : Daniel Bermond < yahoo-com: danielbermond > # Contributor: Micah Chambers +# NOTE: +# In order to build with NCCL support, uncomment the NCCL +# lines in 'depends' and 'preprare()'. + pkgname=caffe pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (gpu enabled)" arch=('x86_64') url="http://caffe.berkeleyvision.org/" @@ -18,8 +22,8 @@ depends=( # AUR: # required: 'openblas-lapack' - # not required but enabled in build: - 'nccl' + # not required: + # 'nccl' # python: 'python-leveldb' 'python-scikit-image' 'python-pydotplus' # NOTE: @@ -42,7 +46,7 @@ prepare() { sed -i '/USE_CUDNN/s/^#[[:space:]]//g' Makefile.config # enable NCCL acceleration switch - sed -i '/USE_NCCL/s/^#[[:space:]]//g' Makefile.config + # sed -i '/USE_NCCL/s/^#[[:space:]]//g' Makefile.config # strictly enable I/O dependencies sed -i '/USE_OPENCV/s/^#[[:space:]]//;/USE_OPENCV/s/0/1/' Makefile.config