summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-05-08 02:11:06 +0000
committerDaniel Bermond2018-05-08 02:11:06 +0000
commit5d4fa2353e1e4cfa81b0760602bce0af6e18bef3 (patch)
tree66cca1a86d09b195b552963302ef515982cba4f3
parent2e9cbfa04cc6a66157ea99c4991cb389f25d30e3 (diff)
downloadaur-5d4fa2353e1e4cfa81b0760602bce0af6e18bef3.tar.gz
makedepends: remove gcc5. package(): remove unneeded onnx files.
gcc54 is now a dependency for cuda, sot it will be already pulled. Letting gcc5 (as it was until now) will cause a package conflict with gcc54. References ---------- https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/cuda&id=2b0be9b7390fa897edb6e4f44224eaf8619399c9
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4975726fcc..06f6c7d7ba9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (git version, gpu enabled)
- pkgver = 0.8.2.r11045.g762eb3ddc
+ pkgver = 0.8.2.r11145.gb6adecdee
pkgrel = 1
epoch = 1
url = http://caffe2.ai/
@@ -8,7 +8,6 @@ pkgbase = caffe2-git
license = BSD
makedepends = git
makedepends = cmake
- makedepends = gcc5
depends = google-glog
depends = protobuf
depends = lapack
diff --git a/PKGBUILD b/PKGBUILD
index b814e501b24..6a09a221e66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# -DNCCL_ROOT_DIR:PATH='/opt/cuda'
pkgname=caffe2-git
-pkgver=0.8.2.r11045.g762eb3ddc
+pkgver=0.8.2.r11145.gb6adecdee
pkgrel=1
epoch=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework (git version, gpu enabled)'
@@ -36,7 +36,7 @@ depends=(
'python-nvd3' 'python-scikit-image' 'python-glog' 'python-leveldb'
'python-lmdb'
)
-makedepends=('git' 'cmake' 'gcc5')
+makedepends=('git' 'cmake')
provides=('caffe2')
conflicts=('caffe' 'caffe-cpu' 'caffe-git' 'caffe-cpu-git'
'caffe2' 'caffe2-cpu' 'caffe2-cpu-git')
@@ -244,11 +244,11 @@ package() {
make DESTDIR="$pkgdir" install
# remove unneeded files
- rm -rf "${pkgdir}/usr/include/google"
- rm -rf "${pkgdir}/usr/lib/cmake/protobuf"
+ rm -rf "$pkgdir"/usr/include/{google,onnx}
+ rm -rf "$pkgdir"/usr/lib/cmake/protobuf
rm -f "$pkgdir"/usr/bin/{protoc,unzstd,zstd{cat,mt,}}
rm -f "$pkgdir"/usr/include/{{bitcasts,cpuinfo,fp16,fxdiv,nnpack,psimd,pthreadpool,zbuff,zdict,zstd*}.h,{__init__,avx{,2}}.py}
- rm -f "$pkgdir"/usr/lib/lib{{cpuinfo,nnpack,protobuf-lite,protobuf,protoc,pthreadpool,zstd}.a,zstd.so*}
+ rm -f "$pkgdir"/usr/lib/lib{{cpuinfo,nnpack,onnx{,_proto},protobuf-lite,protobuf,protoc,pthreadpool,zstd}.a,zstd.so*}
rm -f "$pkgdir"/usr/lib/pkgconfig/{protobuf-lite,protobuf}.pc
rm -f "$pkgdir"/usr/share/pkgconfig/libzstd.pc
rm -f "$pkgdir"/usr/share/man/man1/{unzstd,zstd{cat,}}.1