summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-05-30 22:13:07 +0000
committerDaniel Bermond2018-05-30 22:13:07 +0000
commitfa56856a2405d3ea1206c2c06942213b4f144d90 (patch)
tree113f9cb271d90b6140100c6e7781bbf9c5e4484c
parent43eed51e807f1901aa09d7ef26cbd2f268f52112 (diff)
downloadaur-fa56856a2405d3ea1206c2c06942213b4f144d90.tar.gz
Changes for cuda 9.2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b537290bd67..dc8474462bd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
-# Generated by mksrcinfo v8
-# Sun Oct 15 16:39:29 UTC 2017
pkgbase = caffe
pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (gpu enabled)
pkgver = 1.0
- pkgrel = 8
+ pkgrel = 9
url = http://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
- makedepends = gcc6
+ makedepends = gcc7
makedepends = doxygen
makedepends = texlive-core
depends = boost-libs
diff --git a/PKGBUILD b/PKGBUILD
index b29196b1f68c..f08589c7e117 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=caffe
pkgver=1.0
-pkgrel=8
+pkgrel=9
pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (gpu enabled)'
arch=('x86_64')
url='http://caffe.berkeleyvision.org/'
@@ -30,7 +30,7 @@ depends=(
# python-pydotplus (or python-pydot) is required by python executable draw_net.py
# ttps://github.com/BVLC/caffe/blob/691febcb83d6a3147be8e9583c77aefaac9945f8/python/caffe/draw.py#L7-L22
)
-makedepends=('gcc6' 'doxygen' 'texlive-core')
+makedepends=('gcc7' 'doxygen' 'texlive-core')
conflicts=('caffe-git' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git'
'caffe2' 'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git')
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/BVLC/${pkgname}/archive/${pkgver}.tar.gz")
@@ -54,8 +54,8 @@ prepare() {
sed -i '/USE_LMDB/s/^#[[:space:]]//;/USE_LMDB/s/0/1/' Makefile.config
sed -i '/OPENCV_VERSION/s/^#[[:space:]]//g' Makefile.config
- # use gcc6 (CUDA 9.0 code requires gcc6)
- sed -i '/CUSTOM_CXX/s/^#[[:space:]]//;/CUSTOM_CXX/s/$/-6/' Makefile.config
+ # use gcc6 (CUDA 9.2 code requires gcc7)
+ sed -i '/CUSTOM_CXX/s/^#[[:space:]]//;/CUSTOM_CXX/s/$/-7/' Makefile.config
# set CUDA directory
sed -i '/CUDA_DIR/s/\/usr\/local\/cuda/\/opt\/cuda/' Makefile.config