summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-05-30 22:11:02 +0000
committerDaniel Bermond2018-05-30 22:13:15 +0000
commitfdb8af2c6185b42fee0752dd096b663665adf09d (patch)
tree7139fbbbe2f96ee0d64c9ae62e1588a7cdc0165f
parentf4c29ff279e0f6874e26623a8a8247016f482bc9 (diff)
downloadaur-fdb8af2c6185b42fee0752dd096b663665adf09d.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 244f6fb31952..8f44b2b5138c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
-# Generated by mksrcinfo v8
-# Sun Oct 15 16:24:46 UTC 2017
pkgbase = caffe-git
pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (git version, gpu enabled)
- pkgver = 1.0.r35.g691febcb8
+ pkgver = 1.0.r108.g864520713
pkgrel = 1
url = http://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
makedepends = git
- makedepends = gcc6
+ makedepends = gcc7
makedepends = doxygen
makedepends = texlive-core
depends = boost-libs
diff --git a/PKGBUILD b/PKGBUILD
index 45f24927d4ba..b8e1502a8225 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=caffe-git
_srcname=caffe
-pkgver=1.0.r35.g691febcb8
+pkgver=1.0.r108.g864520713
pkgrel=1
pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (git version, gpu enabled)"
arch=('x86_64')
@@ -32,7 +32,7 @@ depends=(
# python-pydotplus (or python-pydot) is required by python executable draw_net.py
# https://github.com/BVLC/caffe/blob/691febcb83d6a3147be8e9583c77aefaac9945f8/python/caffe/draw.py#L7-L22
)
-makedepends=('git' 'gcc6' 'doxygen' 'texlive-core')
+makedepends=('git' 'gcc7' 'doxygen' 'texlive-core')
provides=('caffe')
conflicts=('caffe' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git'
'caffe2' 'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git')
@@ -57,8 +57,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