summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-03 22:00:52 +0000
committerDaniel Bermond2018-10-03 22:00:52 +0000
commit301ecaefc7699c154e45d26f2dca3e9560fcd0d4 (patch)
tree03d7a28f286aadb493a8bc42908236cc4cbed2e5
parent8a10c8d5b5d39510532bbca3b9d8a9ec6d873256 (diff)
downloadaur-301ecaefc7699c154e45d26f2dca3e9560fcd0d4.tar.gz
Update conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6aef770d164..faa29a491b5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = caffe2-cuda-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (with cuda, git version)
- pkgver = 0.8.2.r13650.g93ecf4d72a
+ pkgver = 0.8.2.r13687.gd1ac1eba3b
pkgrel = 1
url = http://caffe2.ai/
arch = x86_64
@@ -54,8 +54,6 @@ pkgbase = caffe2-cuda-git
conflicts = caffe2
conflicts = caffe2-git
conflicts = caffe2-cuda
- conflicts = caffe2-cpu
- conflicts = caffe2-cpu-git
options = !emptydirs
source = pytorch-git::git+https://github.com/pytorch/pytorch.git
source = caffe2-submodule-catch::git+https://github.com/catchorg/Catch2.git
diff --git a/PKGBUILD b/PKGBUILD
index 8f3aea996767..af9e5d03473a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
pkgname=caffe2-cuda-git
-pkgver=0.8.2.r13650.g93ecf4d72a
+pkgver=0.8.2.r13687.gd1ac1eba3b
pkgrel=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework (with cuda, git version)'
arch=('x86_64')
@@ -29,7 +29,7 @@ depends=(
)
makedepends=('git' 'cmake' 'gcc7')
provides=('caffe2' 'caffe2-git' 'caffe2-cuda')
-conflicts=('caffe2' 'caffe2-git' 'caffe2-cuda' 'caffe2-cpu' 'caffe2-cpu-git')
+conflicts=('caffe2' 'caffe2-git' 'caffe2-cuda')
options=('!emptydirs')
source=(
# main source: