summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-11-22 15:55:26 +0000
committerDaniel Bermond2018-11-22 15:55:26 +0000
commit953f303217a717564743e29dd30fe337f7816a45 (patch)
treec426fe0a2de6d763513681d75f96dac0f5a9d1b4
parent62c6ca0ae5659f928b2e2382ceb46632754d7a1b (diff)
downloadaur-953f303217a717564743e29dd30fe337f7816a45.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 e61e8d0f75f6..2927d181d6cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe2-cuda-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (with cuda, git version)
pkgver = 0.8.2.r14826.gf79fb58744
- pkgrel = 1
+ pkgrel = 2
url = https://caffe2.ai/
arch = x86_64
license = BSD
@@ -52,6 +52,7 @@ pkgbase = caffe2-cuda-git
provides = caffe2-git
provides = caffe2-cuda
conflicts = caffe2
+ conflicts = python-pytorch
options = !emptydirs
source = git+https://github.com/pytorch/pytorch.git
source = git+https://github.com/pybind/pybind11.git
diff --git a/PKGBUILD b/PKGBUILD
index 443b43899839..1e195d0ac79d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=caffe2-cuda-git
_srcname=pytorch
pkgver=0.8.2.r14826.gf79fb58744
-pkgrel=1
+pkgrel=2
pkgdesc='A new lightweight, modular, and scalable deep learning framework (with cuda, git version)'
arch=('x86_64')
url='https://caffe2.ai/'
@@ -30,7 +30,7 @@ depends=(
)
makedepends=('git' 'cmake' 'gcc7')
provides=('caffe2' 'caffe2-git' 'caffe2-cuda')
-conflicts=('caffe2')
+conflicts=('caffe2' 'python-pytorch')
options=('!emptydirs')
source=(
# main source: