summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-11-22 15:56:23 +0000
committerDaniel Bermond2018-11-22 15:56:23 +0000
commit97c7a17cfcb83fec51474260cbb8578b8ce25a29 (patch)
tree678676a24c5899e30aa63a5734a5e519d8bd5ed4
parent30a6e26b4d4593d54fc14685352c0e3a7877c7be (diff)
downloadaur-97c7a17cfcb83fec51474260cbb8578b8ce25a29.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 5e7fb96188f..2aca25b1fa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe2
pkgdesc = A new lightweight, modular, and scalable deep learning framework
pkgver = 0.8.2.pytorch.1.0rc1
- pkgrel = 6
+ pkgrel = 7
url = https://caffe2.ai/
arch = i686
arch = x86_64
@@ -50,6 +50,7 @@ pkgbase = caffe2
depends = python-lmdb
provides = caffe2-cpu
conflicts = caffe2-cpu
+ conflicts = python-pytorch
replaces = caffe2-cpu
options = !emptydirs
source = pytorch-1.0rc1.tar.gz::https://github.com/pytorch/pytorch/archive/v1.0rc1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 53aa303fde3..cf273219851 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,7 @@ _pytorchver=1.0rc1 # pytorch stable release version
pkgname=caffe2
pkgver="0.8.2.pytorch.${_pytorchver}"
-pkgrel=6
+pkgrel=7
pkgdesc='A new lightweight, modular, and scalable deep learning framework'
arch=('i686' 'x86_64')
url='https://caffe2.ai/'
@@ -57,7 +57,7 @@ depends=(
)
makedepends=('git' 'cmake')
provides=('caffe2-cpu')
-conflicts=('caffe2-cpu')
+conflicts=('caffe2-cpu' 'python-pytorch')
replaces=('caffe2-cpu')
options=('!emptydirs')
source=(