summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorDaniel Bermond2017-04-30 12:37:41 -0300
committerDaniel Bermond2017-04-30 12:37:41 -0300
commit40ea1d8c4775d6a8c223290db3e8200f6dfc9a84 (patch)
treea00b517a38796a24980ee1906d5fc44993bfe51b /PKGBUILD
parenta61772827e0dd890d2a074259e242033e7bed102 (diff)
downloadaur-40ea1d8c4775d6a8c223290db3e8200f6dfc9a84.tar.gz
conflicts: added caffe2 packages
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD5
1 files changed, 3 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index bfb887a553e1..cc22641481c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=caffe-git
pkgver=rc5.r14.gc0597b159
-pkgrel=2
+pkgrel=3
pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (git version, gpu enabled)"
arch=('x86_64')
url="http://caffe.berkeleyvision.org/"
@@ -20,7 +20,8 @@ depends=( # binary repositories:
'python-pydot')
makedepends=('git' 'doxygen' 'texlive-core')
provides=('caffe')
-conflicts=('caffe' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git')
+conflicts=('caffe' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git'
+ 'caffe2' 'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git')
source=("${pkgname}"::"git+https://github.com/BVLC/caffe.git")
sha256sums=('SKIP')