summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-06-23 12:30:28 +0000
committerDaniel Bermond2019-06-23 12:30:28 +0000
commitea82a22b996db86078c24642d06ab9189b80c76e (patch)
tree28db937cdd2c7e08761def87eadf84bebcefded7
parent25dc4c6c0581176309af104fac1799547471374a (diff)
downloadaur-ea82a22b996db86078c24642d06ab9189b80c76e.tar.gz
Use compiler filepath defined by the cuda package
-rw-r--r--.SRCINFO6
-rw-r--r--Makefile.config2
-rw-r--r--PKGBUILD6
3 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index edd092a287eb..6defde019cce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe-cuda-git
- pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (with cuda, git version)
+ pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (with cuda support, git version)
pkgver = 1.0.r134.g04ab089db
- pkgrel = 1
+ pkgrel = 2
url = https://caffe.berkeleyvision.org/
arch = x86_64
license = BSD
@@ -50,7 +50,7 @@ pkgbase = caffe-cuda-git
source = Makefile.config
source = caffe-git-opencv4-fix.patch
sha256sums = SKIP
- sha256sums = d022edfc85f43f0f094240ef4852fbd62eb60aab9792a674b259860253207314
+ sha256sums = ec7e3ce95966682b6fa05ec98b4fc924f4cef15358ddf17f076d36ea01e4fb18
sha256sums = 2072c8ca1393b53ef280a15c43af940cc9bf1419ae32b3d8a6541b10b8cb50e9
pkgname = caffe-cuda-git
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 c85e8bbd2b30..7fd4e959a653 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgname=caffe-cuda-git
_srcname=caffe
pkgver=1.0.r134.g04ab089db
-pkgrel=1
-pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (with cuda, git version)'
+pkgrel=2
+pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (with cuda support, git version)'
arch=('x86_64')
url='https://caffe.berkeleyvision.org/'
license=('BSD')
@@ -29,7 +29,7 @@ source=('git+https://github.com/BVLC/caffe.git'
'Makefile.config'
'caffe-git-opencv4-fix.patch')
sha256sums=('SKIP'
- 'd022edfc85f43f0f094240ef4852fbd62eb60aab9792a674b259860253207314'
+ 'ec7e3ce95966682b6fa05ec98b4fc924f4cef15358ddf17f076d36ea01e4fb18'
'2072c8ca1393b53ef280a15c43af940cc9bf1419ae32b3d8a6541b10b8cb50e9')
prepare() {