summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5934e6f65e70..400b8998f1de 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 = 1
+ pkgrel = 2
url = http://caffe2.ai/
arch = i686
arch = x86_64
@@ -48,9 +48,8 @@ pkgbase = caffe2
depends = python-glog
depends = python-leveldb
depends = python-lmdb
- conflicts = caffe2-git
- conflicts = caffe2-cuda
- conflicts = caffe2-cuda-git
+ provides = caffe2-cpu
+ conflicts = caffe2-cpu
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 cd34027e0050..d2acdf0403bd 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=1
+pkgrel=2
pkgdesc='A new lightweight, modular, and scalable deep learning framework'
arch=('i686' 'x86_64')
url='http://caffe2.ai/'
@@ -56,7 +56,8 @@ depends=(
'python-lmdb'
)
makedepends=('git' 'cmake')
-conflicts=('caffe2-git' 'caffe2-cuda' 'caffe2-cuda-git')
+provides=('caffe2-cpu')
+conflicts=('caffe2-cpu')
replaces=('caffe2-cpu')
options=('!emptydirs')
source=(