summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-06-23 12:33:10 +0000
committerDaniel Bermond2019-06-23 12:33:10 +0000
commit0ab4024105d4d5345a42fdd5b5fea66297ca841e (patch)
tree831fe8173921c0a60fb3ba4dd6888c5742b03479
parent38284ed64ba6e56880a801670a2c971afa968348 (diff)
downloadaur-0ab4024105d4d5345a42fdd5b5fea66297ca841e.tar.gz
Use compiler filepath defined by the cuda package
-rw-r--r--.SRCINFO4
-rw-r--r--Makefile.config2
-rw-r--r--PKGBUILD4
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50fcfe99b6b4..ddf9b65f9b31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe-cuda
pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (with cuda support)
pkgver = 1.0
- pkgrel = 7
+ pkgrel = 8
url = https://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
@@ -48,7 +48,7 @@ pkgbase = caffe-cuda
source = Makefile.config
source = caffe-1.0-opencv4-fix.patch
sha256sums = 71d3c9eb8a183150f965a465824d01fe82826c22505f7aa314f700ace03fa77f
- sha256sums = d022edfc85f43f0f094240ef4852fbd62eb60aab9792a674b259860253207314
+ sha256sums = ec7e3ce95966682b6fa05ec98b4fc924f4cef15358ddf17f076d36ea01e4fb18
sha256sums = 2072c8ca1393b53ef280a15c43af940cc9bf1419ae32b3d8a6541b10b8cb50e9
pkgname = caffe-cuda
diff --git a/Makefile.config b/Makefile.config
index a78432bd9c6c..f30fd693a015 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -7,7 +7,7 @@ USE_OPENCV := 1
USE_LEVELDB := 1
USE_LMDB := 1
OPENCV_VERSION := $(_OCVMAJ)
-CUSTOM_CXX := g++
+CUSTOM_CXX := /opt/cuda/bin/g++
CUDA_DIR := /opt/cuda
CUDA_ARCH := -gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_32,code=sm_32 \
diff --git a/PKGBUILD b/PKGBUILD
index 05be88f4febe..9b9c09e03eb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=caffe-cuda
_srcname=caffe
pkgver=1.0
-pkgrel=7
+pkgrel=8
pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (with cuda support)'
arch=('x86_64')
url='https://caffe.berkeleyvision.org/'
@@ -29,7 +29,7 @@ source=("${_srcname}-${pkgver}.tar.gz"::"https://github.com/BVLC/caffe/archive/$
'Makefile.config'
'caffe-1.0-opencv4-fix.patch')
sha256sums=('71d3c9eb8a183150f965a465824d01fe82826c22505f7aa314f700ace03fa77f'
- 'd022edfc85f43f0f094240ef4852fbd62eb60aab9792a674b259860253207314'
+ 'ec7e3ce95966682b6fa05ec98b4fc924f4cef15358ddf17f076d36ea01e4fb18'
'2072c8ca1393b53ef280a15c43af940cc9bf1419ae32b3d8a6541b10b8cb50e9')
prepare() {