summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-07-25 16:27:16 +0000
committerDaniel Bermond2018-07-25 16:27:16 +0000
commit1cab3586aa697579cf363d78eb6a63f398b6e2af (patch)
treeedc5545761284237b41f79f209937ff8a3b5181c
parent74b2bb49ba17acb5145999ebb151934e6446c802 (diff)
downloadaur-1cab3586aa697579cf363d78eb6a63f398b6e2af.tar.gz
Remove tbb git submodule (temporarily removed by upstream)
References ---------- https://github.com/pytorch/pytorch/commit/05c473b85cf40908ffefb16351bcc49ac582968f
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
2 files changed, 5 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dac60cb892a..e32385e251e 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.r11491.gf8e83dc25
+ pkgver = 0.8.2.r12358.g8825e323b
pkgrel = 1
epoch = 1
url = http://caffe2.ai/
@@ -58,7 +58,6 @@ pkgbase = caffe2-git
conflicts = caffe2-cpu-git
options = !emptydirs
source = pytorch-git::git+https://github.com/pytorch/pytorch.git
- source = caffe2-submodule-tbb::git+https://github.com/01org/tbb#branch=tbb_2018
source = caffe2-submodule-catch::git+https://github.com/catchorg/Catch2.git
source = caffe2-submodule-nanopb::git+https://github.com/nanopb/nanopb.git
source = caffe2-submodule-pybind11::git+https://github.com/pybind/pybind11.git
@@ -114,7 +113,6 @@ pkgbase = caffe2-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = SKIP
pkgname = caffe2-git
diff --git a/PKGBUILD b/PKGBUILD
index 303f91f9425..58430db85fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# -DNCCL_ROOT_DIR:PATH='/opt/cuda'
pkgname=caffe2-git
-pkgver=0.8.2.r11491.gf8e83dc25
+pkgver=0.8.2.r12358.g8825e323b
pkgrel=1
epoch=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework (git version, gpu enabled)'
@@ -45,7 +45,6 @@ source=(
# main source:
'pytorch-git'::'git+https://github.com/pytorch/pytorch.git'
# git submodules:
- 'caffe2-submodule-tbb'::'git+https://github.com/01org/tbb#branch=tbb_2018'
'caffe2-submodule-catch'::'git+https://github.com/catchorg/Catch2.git'
'caffe2-submodule-nanopb'::'git+https://github.com/nanopb/nanopb.git'
'caffe2-submodule-pybind11'::'git+https://github.com/pybind/pybind11.git'
@@ -101,14 +100,13 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
'SKIP')
prepare() {
cd pytorch-git
- local _submodule_list="tbb catch nanopb pybind11 cub eigen googletest nervanagpu \
- benchmark protobuf ios-cmake NNPACK gloo NNPACK_deps/pthreadpool \
+ local _submodule_list="catch nanopb pybind11 cub eigen googletest nervanagpu benchmark \
+ protobuf ios-cmake NNPACK gloo NNPACK_deps/pthreadpool \
NNPACK_deps/FXdiv NNPACK_deps/FP16 NNPACK_deps/psimd zstd \
python-enum python-peachpy python-six ComputeLibrary onnx cereal \
onnx-tensorrt sleef ideep"
@@ -230,6 +228,7 @@ build() {
-DUSE_PROF:BOOL='OFF' \
-DUSE_REDIS:BOOL='ON' \
-DUSE_ROCKSDB:BOOL='OFF' \
+ -DUSE_ROCM:BOOL='OFF' \
-DUSE_SNPE:BOOL='OFF' \
-DUSE_SYSTEM_NCCL:BOOL='ON' \
-DUSE_TENSORRT:BOOL='OFF' \