Changes for cuda 9.2

master
Daniel Bermond 6 years ago committed by Peter Babič
parent 180438e289
commit b2611e8c2f
  1. 6
      .SRCINFO
  2. 8
      PKGBUILD

@ -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

@ -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

Loading…
Cancel
Save