summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-11-22 15:55:46 +0000
committerDaniel Bermond2018-11-22 15:55:46 +0000
commit0bbecda9321accec7adb9a41da9979826c712ed6 (patch)
tree82f4dcc7d377eb889100245cbcf564f3f82562d2
parentfb148194b83bc65ea980b2b36863c0fe8d72eab7 (diff)
downloadaur-0bbecda9321accec7adb9a41da9979826c712ed6.tar.gz
conflicts: add python-pytorch
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d568241d74..6dec02b7300 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (git version)
pkgver = 0.8.2.r14826.gf79fb58744
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://caffe2.ai/
arch = i686
@@ -53,6 +53,7 @@ pkgbase = caffe2-git
provides = caffe2-cpu-git
conflicts = caffe2
conflicts = caffe2-cpu-git
+ conflicts = python-pytorch
replaces = caffe2-cpu-git
options = !emptydirs
source = git+https://github.com/pytorch/pytorch.git
diff --git a/PKGBUILD b/PKGBUILD
index 06aa821f8fb..299764b69f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=caffe2-git
_srcname=pytorch
pkgver=0.8.2.r14826.gf79fb58744
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework (git version)'
arch=('i686' 'x86_64')
@@ -30,7 +30,7 @@ depends=(
)
makedepends=('git' 'cmake')
provides=('caffe2' 'caffe2-cpu-git')
-conflicts=('caffe2' 'caffe2-cpu-git')
+conflicts=('caffe2' 'caffe2-cpu-git' 'python-pytorch')
replaces=('caffe2-cpu-git')
options=('!emptydirs')
source=(