Updated to version 0.8.2 from pytorch stable version 0.4.0

Caffe2 source code moved to PyTorch repository. It now resides into pytorch releases. Note ---- gcc5 is currently on the [community] repository. It was moved from the AUR to [community] due to CUDA. Removed gcc5 from the AUR block on makedepends.
author: Daniel Bermond 2018-04-30 18:56:54 +0000
committer: Daniel Bermond 2018-04-30 18:56:54 +0000
commit: 2dffebed28bc8fc6044cc0083e1398361104522d (patch)
tree: 504b5940baef23f88dfe9ab49f57de87d7bbba92
parent: f6fdbe63cced38c7443b9553493377919710cf64 (diff)
download: aur-2dffebed28bc8fc6044cc0083e1398361104522d.tar.gz
4 files changed, 216 insertions, 245 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a433f0df9f5..85a74519e1e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = caffe2
 	pkgdesc = A new lightweight, modular, and scalable deep learning framework (gpu enabled)
-	pkgver = 0.8.1
-	pkgrel = 7
+	pkgver = 0.8.2.pytorch.0.4.0
+	pkgrel = 1
 	url = http://caffe2.ai/
 	arch = x86_64
 	license = BSD
 	makedepends = git
 	makedepends = cmake
-	makedepends = ninja
-	makedepends = python
 	makedepends = gcc5
-	makedepends = confu-git
-	makedepends = python-peachpy-git
 	depends = google-glog
 	depends = protobuf
-	depends = python2
-	depends = python2-numpy
-	depends = python2-protobuf
+	depends = lapack
+	depends = python
+	depends = python-numpy
+	depends = python-protobuf
 	depends = cuda
 	depends = cudnn
 	depends = gflags
@@ -24,31 +21,32 @@ pkgbase = caffe2
 	depends = openmp
 	depends = leveldb
 	depends = lmdb
+	depends = numactl
 	depends = openmpi
 	depends = snappy
 	depends = zeromq
 	depends = hiredis
 	depends = ffmpeg
-	depends = python2-flask
-	depends = python2-future
+	depends = python-flask
+	depends = python-future
 	depends = graphviz
-	depends = python2-hypothesis
-	depends = python2-jupyter_core
-	depends = python2-matplotlib
-	depends = python2-pydot
-	depends = python2-yaml
-	depends = python2-requests
-	depends = python2-scipy
-	depends = python2-setuptools
-	depends = python2-six
-	depends = python2-tornado
-	depends = python2-gflags
-	depends = python2-pyzmq
-	depends = python2-nvd3
-	depends = python2-scikit-image
-	depends = python2-glog
-	depends = python2-leveldb
-	depends = python2-lmdb
+	depends = python-hypothesis
+	depends = python-jupyter_core
+	depends = python-matplotlib
+	depends = python-pydot
+	depends = python-yaml
+	depends = python-requests
+	depends = python-scipy
+	depends = python-setuptools
+	depends = python-six
+	depends = python-tornado
+	depends = python-gflags
+	depends = python-pyzmq
+	depends = python-nvd3
+	depends = python-scikit-image
+	depends = python-glog
+	depends = python-leveldb
+	depends = python-lmdb
 	conflicts = caffe
 	conflicts = caffe-cpu
 	conflicts = caffe-git
@@ -56,49 +54,63 @@ pkgbase = caffe2
 	conflicts = caffe2-git
 	conflicts = caffe2-cpu
 	conflicts = caffe2-cpu-git
-	noextract = caffe2-thirdparty-eigen-3.3.2.tar.gz
-	noextract = caffe2-thirdparty-protobuf-3.1.0.tar.gz
+	noextract = caffe2-thirdparty-aten-tbb-2018_U2.tar.gz
+	noextract = caffe2-thirdparty-aten-catch-2.2.1.tar.gz
+	noextract = thirdparty-protobuf-3.5.0.tar.gz
+	noextract = caffe2-thirdparty-python-six-1.11.0.tar.gz
 	options = !emptydirs
-	source = caffe2-0.8.1.tar.gz::https://github.com/caffe2/caffe2/archive/v0.8.1.tar.gz
-	source = caffe2-thirdparty-android-cmake-git::git+https://github.com/taka-no-me/android-cmake.git#commit=556cc14296c226f753a3778d99d8b60778b7df4f
-	source = caffe2-thirdparty-benchmark-git::git+https://github.com/google/benchmark.git#commit=4bf28e611b55de8a2d4eece3c335e014f8b0f630
-	source = caffe2-thirdparty-cnmem-git::git+https://github.com/NVIDIA/cnmem.git#commit=28a182d49529da49f4ac4e3941cec3edf16b3540
-	source = caffe2-thirdparty-cub-git::git+https://github.com/NVlabs/cub.git#commit=b1370adb972a8345de92e2d69e61daf7f9bce43e
-	source = caffe2-thirdparty-eigen-3.3.2.tar.gz::https://github.com/RLovelett/eigen/archive/3.3.2.tar.gz
-	source = caffe2-thirdparty-gloo-git::git+https://github.com/facebookincubator/gloo.git#commit=530878247b04c423fd35477208f68e70b8126e2d
-	source = caffe2-thirdparty-googletest-git::git+https://github.com/google/googletest.git#commit=5e7fd50e17b6edf1cadff973d0ec68966cf3265e
-	source = caffe2-thirdparty-ios-cmake-git::git+https://github.com/Yangqing/ios-cmake.git#commit=e24081928d9ceec4f4adfcf12293f1e2a20eaedc
-	source = caffe2-thirdparty-nccl-git::git+https://github.com/NVIDIA/nccl.git#commit=2a974f5ca2aa12b178046b2206b43f1fd69d9fae
+	source = pytorch-0.4.0.tar.gz::https://github.com/pytorch/pytorch/archive/v0.4.0.tar.gz
+	source = caffe2-thirdparty-aten-cpuinfo-git::git+https://github.com/Maratyszcza/cpuinfo#commit=d0222b47948234cc01983243a2e0ede018f97f3a
+	source = caffe2-thirdparty-aten-tbb-2018_U2.tar.gz::https://github.com/01org/tbb/archive/2018_U2.tar.gz
+	source = caffe2-thirdparty-aten-catch-2.2.1.tar.gz::https://github.com/catchorg/Catch2/archive/v2.2.1.tar.gz
+	source = caffe2-thirdparty-nanopb-git::git+https://github.com/nanopb/nanopb.git#commit=14efb1a47a496652ab08b1ebcefb0ea24ae4a5e4
+	source = caffe2-thirdparty-pybind11-git::git+https://github.com/pybind/pybind11.git#commit=add56ccdcac23a6c522a2c1174a866e293c61dab
+	source = caffe2-thirdparty-cub-git::git+https://github.com/NVlabs/cub.git#commit=285aeebaa34b0e8a7670867a2e66c1a52d998d6a
+	source = caffe2-thirdparty-eigen-git::git+https://github.com/RLovelett/eigen.git#commit=5a0ab9ff4e258b860470afe36e83a3e88b3ce14c
+	source = caffe2-thirdparty-googletest-git::git+https://github.com/google/googletest.git#commit=69e48e92de43960a316a826293510b7b3deb9eca
 	source = caffe2-thirdparty-nervanagpu-git::git+https://github.com/NervanaSystems/nervanagpu.git#commit=d4eefd50fbd7d34a17dddbc829888835d67b5f4a
-	source = caffe2-thirdparty-NNPACK-git::git+https://github.com/Maratyszcza/NNPACK.git#commit=02bfa475d64040cd72b7c01daa9e862523ae87da
-	source = caffe2-thirdparty-protobuf-3.1.0.tar.gz::https://github.com/google/protobuf/archive/v3.1.0.tar.gz
-	source = caffe2-thirdparty-pybind11-git::git+https://github.com/pybind/pybind11.git#commit=f38f359f96815421f1780c1a676715efd041f1ae
-	source = caffe2-thirdparty-NNPACK_deps-FP16-git::git+https://github.com/Maratyszcza/FP16.git#commit=2e9eeeb0b463736d13b887d790ac7e72e78fa4bc
-	source = caffe2-thirdparty-NNPACK_deps-FXdiv-git::git+https://github.com/Maratyszcza/FXdiv.git#commit=8f85044fb41e560508cd69ed26c9afb9cc120e8a
-	source = caffe2-thirdparty-NNPACK_deps-psimd-git::git+https://github.com/Maratyszcza/psimd.git#commit=0b26a3fb98dd6af7e1f4e0796c56df6b32b1c016
-	source = caffe2-thirdparty-NNPACK_deps-pthreadpool-git::git+https://github.com/Maratyszcza/pthreadpool.git#commit=9e17903a3fc963fe86b151aaddae7cf1b1d34815
-	source = caffe2-allow-cuda9.patch
-	source = caffe2-cuda9.1-fix.patch
-	sha256sums = 2b7938514caf626da3fdde51e88771adc863cbe496d0fc4ae1122603a945e9a8
+	source = caffe2-thirdparty-benchmark-git::git+https://github.com/google/benchmark.git#commit=491360b833aaab96818dce256a8409f6296dd995
+	source = caffe2-thirdparty-protobuf-3.5.0.tar.gz::https://github.com/google/protobuf/archive/v3.5.0.tar.gz
+	source = caffe2-thirdparty-ios-cmake-git::git+https://github.com/Yangqing/ios-cmake.git#commit=8abaed637d56f1337d6e1d2c4026e25c1eade724
+	source = caffe2-thirdparty-NNPACK-git::git+https://github.com/Maratyszcza/NNPACK.git#commit=b63fe1ba8963f1756b8decc593766615cee99c35
+	source = caffe2-thirdparty-gloo-git::git+https://github.com/facebookincubator/gloo.git#commit=aad0002fb40612e991390d8e807f247ed23f13c5
+	source = caffe2-thirdparty-NNPACK_deps-pthreadpool-git::git+https://github.com/Maratyszcza/pthreadpool.git#commit=2b06b31f6a315162348e1f3c24325eedaf6cc559
+	source = caffe2-thirdparty-NNPACK_deps-FXdiv-git::git+https://github.com/Maratyszcza/FXdiv.git#commit=811b482bcd9e8d98ad80c6c78d5302bb830184b0
+	source = caffe2-thirdparty-NNPACK_deps-FP16-git::git+https://github.com/Maratyszcza/FP16.git#commit=43d6d17df48ebf622587e7ed9472ea76573799b9
+	source = caffe2-thirdparty-NNPACK_deps-psimd-git::git+https://github.com/Maratyszcza/psimd.git#commit=4ac61b112252778b174575931c641bef661ab3cd
+	source = caffe2-thirdparty-zstd-git::git+https://github.com/facebook/zstd.git#commit=aec56a52fbab207fc639a1937d1e708a282edca8
+	source = caffe2-thirdparty-cpuinfo-git::git+https://github.com/Maratyszcza/cpuinfo.git#commit=831dc28341b5f20d13e840caf87eaba644d82643
+	source = caffe2-thirdparty-python-enum-git::git+https://github.com/PeachPy/enum34.git#commit=4cfedc426c4e2fc52e3f5c2b4297e15ed8d6b8c7
+	source = caffe2-thirdparty-python-peachpy-git::git+https://github.com/Maratyszcza/PeachPy.git#commit=07d8fde8ac45d7705129475c0f94ed8925b93473
+	source = caffe2-thirdparty-python-six-1.11.0.tar.gz::https://github.com/benjaminp/six/archive/1.11.0.tar.gz
+	source = caffe2-thirdparty-ComputeLibrary-git::git+https://github.com/ARM-software/ComputeLibrary.git#commit=292227986edb37b01061afcad6df18ba9d6ccbeb
+	source = caffe2-thirdparty-onnx-git::git+https://github.com/onnx/onnx.git#commit=7e1bed51cc508a25b22130de459830b5d5063c41
+	sha256sums = 9ea4cbcab3852a25b8240e27f979d822c2f6f7934cd37033208dc13a8cad9e72
 	sha256sums = SKIP
+	sha256sums = 78bb9bae474736d213342f01fe1a6d00c6939d5c75b367e2e43e7bf29a6d8eca
+	sha256sums = 3938bc896f8de570bc56d25606fc128437ee53590a95cf3e005710176a1a1ce4
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 78fe37183e04aa8ca2d938df57b93f9489448d38c10fb470cf51c332a461f371
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = fb2a314f4be897491bb2446697be693d489af645cb0e165a85e7e64e07eb134d
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 615c855e91965e132eb47f11678c8d8ceda1575e1e052da0ac516e2a791c8aab
-	sha256sums = ca71dd126ce682b387a56387005ec71dd700813282fb7a6a11f1883d8f94e463
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 927dc6fcfccd4e32e1ce161a20bf8cda39d8c9d5f7a845774486907178f69bd4
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = caffe2
 
diff --git a/PKGBUILD b/PKGBUILD
index 6fe72f718c67..3a258dd39ddc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,47 @@
 # Maintainer : Daniel Bermond < yahoo-com: danielbermond >
 
+# NOTE:
+# In order to build with NCCL support, follow these steps:
+#   1) uncomment the nccl line in 'depends'
+#   2) in 'build()', change '-DUSE_NCCL:BOOL=OFF' from 'OFF' to 'ON'
+#   3) add these options to cmake command line:
+#       -DNCCL_INCLUDE_DIR:PATH='/opt/cuda/include'
+#       -DNCCL_ROOT_DIR:PATH='/opt/cuda'
+
 # third_party with no stable release at the target commit
-_android_cmake_commit='556cc14296c226f753a3778d99d8b60778b7df4f'
-_benchmark_commit='4bf28e611b55de8a2d4eece3c335e014f8b0f630'
-_cnmem_commit='28a182d49529da49f4ac4e3941cec3edf16b3540'
-_cub_commit='b1370adb972a8345de92e2d69e61daf7f9bce43e'
-_gloo_commit='530878247b04c423fd35477208f68e70b8126e2d'
-_googletest_commit='5e7fd50e17b6edf1cadff973d0ec68966cf3265e'
-_ios_cmake_commit='e24081928d9ceec4f4adfcf12293f1e2a20eaedc'
-_nccl_commit='2a974f5ca2aa12b178046b2206b43f1fd69d9fae'
+_aten_cpuinfo_commit='d0222b47948234cc01983243a2e0ede018f97f3a'
+_nanopb_commit='14efb1a47a496652ab08b1ebcefb0ea24ae4a5e4'
+_pybind11_commit='add56ccdcac23a6c522a2c1174a866e293c61dab'
+_cub_commit='285aeebaa34b0e8a7670867a2e66c1a52d998d6a'
+_eigen_commit='5a0ab9ff4e258b860470afe36e83a3e88b3ce14c'
+_googletest_commit='69e48e92de43960a316a826293510b7b3deb9eca'
 _nervanagpu_commit='d4eefd50fbd7d34a17dddbc829888835d67b5f4a'
-_nnpack_commit='02bfa475d64040cd72b7c01daa9e862523ae87da'
-_pybind11_commit='f38f359f96815421f1780c1a676715efd041f1ae'
-_nnpackdeps_fp16_commit='2e9eeeb0b463736d13b887d790ac7e72e78fa4bc'
-_nnpackdeps_fxdiv_commit='8f85044fb41e560508cd69ed26c9afb9cc120e8a'
-_nnpackdeps_psimd_commit='0b26a3fb98dd6af7e1f4e0796c56df6b32b1c016'
-_nnpackdeps_pthreadpool_commit='9e17903a3fc963fe86b151aaddae7cf1b1d34815'
+_benchmark_commit='491360b833aaab96818dce256a8409f6296dd995'
+_ios_cmake_commit='8abaed637d56f1337d6e1d2c4026e25c1eade724'
+_nnpack_commit='b63fe1ba8963f1756b8decc593766615cee99c35'
+_gloo_commit='aad0002fb40612e991390d8e807f247ed23f13c5'
+_nnpdeps_pthreadp_commit='2b06b31f6a315162348e1f3c24325eedaf6cc559'
+_nnpdeps_fxdiv_commit='811b482bcd9e8d98ad80c6c78d5302bb830184b0'
+_nnpdeps_fp16_commit='43d6d17df48ebf622587e7ed9472ea76573799b9'
+_nnpdeps_psimd_commit='4ac61b112252778b174575931c641bef661ab3cd'
+_zstd_commit='aec56a52fbab207fc639a1937d1e708a282edca8'
+_cpuinfo_commit='831dc28341b5f20d13e840caf87eaba644d82643'
+_python_enum_commit='4cfedc426c4e2fc52e3f5c2b4297e15ed8d6b8c7'
+_python_peachpy_commit='07d8fde8ac45d7705129475c0f94ed8925b93473'
+_computelibrary_commit='292227986edb37b01061afcad6df18ba9d6ccbeb'
+_onnx_commit='7e1bed51cc508a25b22130de459830b5d5063c41'
+
+# third_party with stable release at the target commit
+_aten_tbb_version='2018_U2'  # commit '4c73c3b5d7f78c40f69e0c04fd4afb9f48add1e6' is version '2018_U2'
+_aten_catch_version='2.2.1'  # commit '0a34cc201ef28bf25c88b0062f331369596cb7b7' is version '2.2.1'
+_protobuf_version='3.5.0'    # commit '2761122b810fe8861004ae785cc3ab39f384d342' is version '3.5.0'
+_python_six_version='1.11.0' # commit '15e31431af97e5e64b80af0a3f598d382bcdd49a' is version '1.11.0'
 
- # third_party with stable release at the target commit
-_eigen_version='3.3.2'    # commit 'ae9889a130bd0a9d3007f41d015563c2e8ac605f' is version '3.3.2'
-_protobuf_version='3.1.0' # commit 'a428e42072765993ff674fda72863c9f1aa2d268' is version '3.1.0'
+_ptver=0.4.0 # pytorch stable release version
 
 pkgname=caffe2
-pkgver=0.8.1
-pkgrel=7
+pkgver="0.8.2.pytorch.${_ptver}"
+pkgrel=1
 pkgdesc='A new lightweight, modular, and scalable deep learning framework (gpu enabled)'
 arch=('x86_64')
 url='http://caffe2.ai/'
@@ -31,92 +49,113 @@ license=('BSD')
 depends=(
     # official repositories:
         # required:
-            'google-glog' 'protobuf' 'python2' 'python2-numpy' 'python2-protobuf'
+            'google-glog' 'protobuf' 'lapack' 'python' 'python-numpy' 'python-protobuf'
             'cuda' 'cudnn'
         # not required but enabled in build:
-            'gflags' 'gtest' 'openmp' 'leveldb' 'lmdb' 'openmpi' 'snappy' 'zeromq'
-            'hiredis' 'ffmpeg'
-        # python2:
-            'python2-flask' 'python2-future' 'graphviz' 'python2-hypothesis'
-            'python2-jupyter_core' 'python2-matplotlib' 'python2-pydot' 'python2-yaml'
-            'python2-requests' 'python2-scipy' 'python2-setuptools' 'python2-six'
-            'python2-tornado' 'python2-gflags' 'python2-pyzmq'
-    # AUR:
-        # python2:
-            'python2-nvd3' 'python2-scikit-image' 'python2-glog' 'python2-leveldb'
-            'python2-lmdb'
-)
-makedepends=(
-    # official repositories:
-        'git' 'cmake' 'ninja' 'python'
+            'gflags' 'gtest' 'openmp' 'leveldb' 'lmdb' 'numactl' 'openmpi' 'snappy'
+            'zeromq' 'hiredis' 'ffmpeg'
+        # python:
+            'python-flask' 'python-future' 'graphviz' 'python-hypothesis'
+            'python-jupyter_core' 'python-matplotlib' 'python-pydot' 'python-yaml'
+            'python-requests' 'python-scipy' 'python-setuptools' 'python-six'
+            'python-tornado' 'python-gflags' 'python-pyzmq'
     # AUR:
-        'gcc5' 'confu-git' 'python-peachpy-git'
+        # not required and disabled in build:
+            #'nccl'
+        # python:
+            'python-nvd3' 'python-scikit-image' 'python-glog' 'python-leveldb'
+            'python-lmdb'
 )
+makedepends=('git' 'cmake' 'gcc5')
 conflicts=('caffe' 'caffe-cpu' 'caffe-git' 'caffe-cpu-git'
            'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git')
 options=('!emptydirs')
 source=(
     # main source:
-        "${pkgname}-${pkgver}.tar.gz"::"https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
+        "pytorch-${_ptver}.tar.gz"::"https://github.com/pytorch/pytorch/archive/v${_ptver}.tar.gz"
     # third party:
-        'caffe2-thirdparty-android-cmake-git'::"git+https://github.com/taka-no-me/android-cmake.git#commit=${_android_cmake_commit}"
-        'caffe2-thirdparty-benchmark-git'::"git+https://github.com/google/benchmark.git#commit=${_benchmark_commit}"
-        'caffe2-thirdparty-cnmem-git'::"git+https://github.com/NVIDIA/cnmem.git#commit=${_cnmem_commit}"
+        'caffe2-thirdparty-aten-cpuinfo-git'::"git+https://github.com/Maratyszcza/cpuinfo#commit=${_aten_cpuinfo_commit}"
+        "caffe2-thirdparty-aten-tbb-${_aten_tbb_version}.tar.gz"::"https://github.com/01org/tbb/archive/${_aten_tbb_version}.tar.gz"
+        "caffe2-thirdparty-aten-catch-${_aten_catch_version}.tar.gz"::"https://github.com/catchorg/Catch2/archive/v${_aten_catch_version}.tar.gz"
+        'caffe2-thirdparty-nanopb-git'::"git+https://github.com/nanopb/nanopb.git#commit=${_nanopb_commit}"
+        'caffe2-thirdparty-pybind11-git'::"git+https://github.com/pybind/pybind11.git#commit=${_pybind11_commit}"
         'caffe2-thirdparty-cub-git'::"git+https://github.com/NVlabs/cub.git#commit=${_cub_commit}"
-        "caffe2-thirdparty-eigen-${_eigen_version}.tar.gz"::"https://github.com/RLovelett/eigen/archive/${_eigen_version}.tar.gz"
-        'caffe2-thirdparty-gloo-git'::"git+https://github.com/facebookincubator/gloo.git#commit=${_gloo_commit}"
+        'caffe2-thirdparty-eigen-git'::"git+https://github.com/RLovelett/eigen.git#commit=${_eigen_commit}"
         'caffe2-thirdparty-googletest-git'::"git+https://github.com/google/googletest.git#commit=${_googletest_commit}"
-        'caffe2-thirdparty-ios-cmake-git'::"git+https://github.com/Yangqing/ios-cmake.git#commit=${_ios_cmake_commit}"
-        'caffe2-thirdparty-nccl-git'::"git+https://github.com/NVIDIA/nccl.git#commit=${_nccl_commit}"
         'caffe2-thirdparty-nervanagpu-git'::"git+https://github.com/NervanaSystems/nervanagpu.git#commit=${_nervanagpu_commit}"
-        'caffe2-thirdparty-NNPACK-git'::"git+https://github.com/Maratyszcza/NNPACK.git#commit=${_nnpack_commit}"
+        'caffe2-thirdparty-benchmark-git'::"git+https://github.com/google/benchmark.git#commit=${_benchmark_commit}"
         "caffe2-thirdparty-protobuf-${_protobuf_version}.tar.gz"::"https://github.com/google/protobuf/archive/v${_protobuf_version}.tar.gz"
-        'caffe2-thirdparty-pybind11-git'::"git+https://github.com/pybind/pybind11.git#commit=${_pybind11_commit}"
-        'caffe2-thirdparty-NNPACK_deps-FP16-git'::"git+https://github.com/Maratyszcza/FP16.git#commit=${_nnpackdeps_fp16_commit}"
-        'caffe2-thirdparty-NNPACK_deps-FXdiv-git'::"git+https://github.com/Maratyszcza/FXdiv.git#commit=${_nnpackdeps_fxdiv_commit}"
-        'caffe2-thirdparty-NNPACK_deps-psimd-git'::"git+https://github.com/Maratyszcza/psimd.git#commit=${_nnpackdeps_psimd_commit}"
-        'caffe2-thirdparty-NNPACK_deps-pthreadpool-git'::"git+https://github.com/Maratyszcza/pthreadpool.git#commit=${_nnpackdeps_pthreadpool_commit}"
-    # patches:
-        'caffe2-allow-cuda9.patch'
-        'caffe2-cuda9.1-fix.patch'
+        'caffe2-thirdparty-ios-cmake-git'::"git+https://github.com/Yangqing/ios-cmake.git#commit=${_ios_cmake_commit}"
+        'caffe2-thirdparty-NNPACK-git'::"git+https://github.com/Maratyszcza/NNPACK.git#commit=${_nnpack_commit}"
+        'caffe2-thirdparty-gloo-git'::"git+https://github.com/facebookincubator/gloo.git#commit=${_gloo_commit}"
+        'caffe2-thirdparty-NNPACK_deps-pthreadpool-git'::"git+https://github.com/Maratyszcza/pthreadpool.git#commit=${_nnpdeps_pthreadp_commit}"
+        'caffe2-thirdparty-NNPACK_deps-FXdiv-git'::"git+https://github.com/Maratyszcza/FXdiv.git#commit=${_nnpdeps_fxdiv_commit}"
+        'caffe2-thirdparty-NNPACK_deps-FP16-git'::"git+https://github.com/Maratyszcza/FP16.git#commit=${_nnpdeps_fp16_commit}"
+        'caffe2-thirdparty-NNPACK_deps-psimd-git'::"git+https://github.com/Maratyszcza/psimd.git#commit=${_nnpdeps_psimd_commit}"
+        'caffe2-thirdparty-zstd-git'::"git+https://github.com/facebook/zstd.git#commit=${_zstd_commit}"
+        'caffe2-thirdparty-cpuinfo-git'::"git+https://github.com/Maratyszcza/cpuinfo.git#commit=${_cpuinfo_commit}"
+        'caffe2-thirdparty-python-enum-git'::"git+https://github.com/PeachPy/enum34.git#commit=${_python_enum_commit}"
+        'caffe2-thirdparty-python-peachpy-git'::"git+https://github.com/Maratyszcza/PeachPy.git#commit=${_python_peachpy_commit}"
+        "caffe2-thirdparty-python-six-${_python_six_version}.tar.gz"::"https://github.com/benjaminp/six/archive/${_python_six_version}.tar.gz"
+        'caffe2-thirdparty-ComputeLibrary-git'::"git+https://github.com/ARM-software/ComputeLibrary.git#commit=${_computelibrary_commit}"
+        'caffe2-thirdparty-onnx-git'::"git+https://github.com/onnx/onnx.git#commit=${_onnx_commit}"
+)
+noextract=("caffe2-thirdparty-aten-tbb-${_aten_tbb_version}.tar.gz"
+           "caffe2-thirdparty-aten-catch-${_aten_catch_version}.tar.gz"
+           "thirdparty-protobuf-${_protobuf_version}.tar.gz"
+           "caffe2-thirdparty-python-six-${_python_six_version}.tar.gz"
 )
-noextract=("caffe2-thirdparty-eigen-${_eigen_version}.tar.gz"
-           "caffe2-thirdparty-protobuf-${_protobuf_version}.tar.gz")
-sha256sums=('2b7938514caf626da3fdde51e88771adc863cbe496d0fc4ae1122603a945e9a8'
+sha256sums=('9ea4cbcab3852a25b8240e27f979d822c2f6f7934cd37033208dc13a8cad9e72'
+            'SKIP'
+            '78bb9bae474736d213342f01fe1a6d00c6939d5c75b367e2e43e7bf29a6d8eca'
+            '3938bc896f8de570bc56d25606fc128437ee53590a95cf3e005710176a1a1ce4'
+            'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '78fe37183e04aa8ca2d938df57b93f9489448d38c10fb470cf51c332a461f371'
             'SKIP'
             'SKIP'
+            '0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'fb2a314f4be897491bb2446697be693d489af645cb0e165a85e7e64e07eb134d'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '615c855e91965e132eb47f11678c8d8ceda1575e1e052da0ac516e2a791c8aab'
-            'ca71dd126ce682b387a56387005ec71dd700813282fb7a6a11f1883d8f94e463')
+            'SKIP'
+            'SKIP'
+            '927dc6fcfccd4e32e1ce161a20bf8cda39d8c9d5f7a845774486907178f69bd4'
+            'SKIP'
+            'SKIP')
 
 prepare() {
-    cd "${pkgname}-${pkgver}/third_party"
+    local _thirdparty_git_list="nanopb pybind11 cub eigen googletest nervanagpu \
+                                benchmark ios-cmake NNPACK gloo zstd cpuinfo \
+                                python-enum python-peachpy ComputeLibrary onnx"
+                                
+    local _nnpackdeps_list='pthreadpool FXdiv FP16 psimd'
     
-    local _thirdparty_nongit_list="eigen protobuf"
-    local _thirdparty_git_list="android-cmake benchmark cnmem cub gloo googletest \
-                                ios-cmake nccl nervanagpu NNPACK pybind11"
-    local _nnpackdeps_list="FP16 FXdiv psimd pthreadpool"
+    cd "pytorch-${_ptver}/aten/src/ATen/cpu"
+    rm -rf cpuinfo
+    ln -sf "${srcdir}/caffe2-thirdparty-aten-cpuinfo-git" cpuinfo
     
-    for _component in $_thirdparty_nongit_list
-    do
-        cd "$_component"
-        bsdtar -xf "${srcdir}/caffe2-thirdparty-${_component}"* -s'|[^/]*/||'
-        cd ..
-    done
+    cd "${srcdir}/pytorch-${_ptver}/aten/src/ATen/cpu/tbb/tbb_remote"
+    bsdtar -xf "${srcdir}/caffe2-thirdparty-aten-tbb-${_aten_tbb_version}.tar.gz" -s'|[^/]*/||'
+    
+    cd "${srcdir}/pytorch-${_ptver}/aten/src/ATen/utils/catch"
+    bsdtar -xf "${srcdir}/caffe2-thirdparty-aten-catch-${_aten_catch_version}.tar.gz" -s'|[^/]*/||'
+    
+    cd "${srcdir}/pytorch-${_ptver}/third_party/protobuf"
+    bsdtar -xf "${srcdir}/caffe2-thirdparty-protobuf-${_protobuf_version}.tar.gz" -s'|[^/]*/||'
+    
+    cd "${srcdir}/pytorch-${_ptver}/third_party/python-six"
+    bsdtar -xf "${srcdir}/caffe2-thirdparty-python-six-${_python_six_version}.tar.gz" -s'|[^/]*/||'
+    
+    cd "${srcdir}/pytorch-${_ptver}/third_party"
     
     for _component in $_thirdparty_git_list
     do
@@ -124,27 +163,24 @@ prepare() {
         ln -sf "${srcdir}/caffe2-thirdparty-${_component}-git" "${_component}"
     done
     
-    cd NNPACK_deps
     for _component in $_nnpackdeps_list
     do
         rm -rf "$_component"
         ln -sf "${srcdir}/caffe2-thirdparty-NNPACK_deps-${_component}-git" "${_component}"
     done
     
-    # cuda 9.1 detection fixes
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -Np1 -i "${srcdir}/caffe2-allow-cuda9.patch"
-    patch -Np1 -i "${srcdir}/caffe2-cuda9.1-fix.patch"
-    
-    # cuda 9.x gpu architecture fixes
-    cd cmake
-    sed -i '2s/^##//;2s/,.*//'  Cuda.cmake # enable cuda 9.x architectures
-    sed -i '2s/[[:space:]]71//' Cuda.cmake # remove unimplemented compute_71 architecture
-    sed -i '6s/20[[:space:]]21(20)[[:space:]]//' Cuda.cmake # remove unsupported compute_20/21 architecture
+    # fix build if eigen is installed (use eigen from third_party folder)
+    cd "${srcdir}/pytorch-${_ptver}"
+    local _eigen='  message(STATUS "Using Eigen third party subdirectory for compatibility.")'
+    sed -i '/find_package(Eigen3)/s/^/#/' cmake/Dependencies.cmake
+    sed -i "/Did[[:space:]]not[[:space:]]find[[:space:]]system[[:space:]]Eigen/s/.*/${_eigen}/" cmake/Dependencies.cmake
 }
 
 build() {
-    cd "${pkgname}-${pkgver}"
+    cd "pytorch-${_ptver}"
+    
+    local _pythonver="$(python --version | sed 's/^Python[[:space:]]//' | grep -o '^[0-9]*\.[0-9]*')"
+    
     mkdir -p build
     cd build
     
@@ -152,17 +188,18 @@ build() {
         -DBLAS:STRING='Eigen' \
         \
         -DBUILD_BINARY:BOOL='ON' \
+        -DBUILD_DOCS:BOOL='OFF' \
         -DBUILD_PYTHON:BOOL='ON' \
         -DBUILD_SHARED_LIBS:BOOL='ON' \
         \
         -DBUILD_TEST:BOOL='OFF' \
         \
-        -DCAFFE2_CPU_FLAGS:BOOL='OFF' \
         -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
         -DCMAKE_CXX_COMPILER='/usr/bin/g++-5' \
         -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS/-fno-plt/}" \
         -DCMAKE_C_COMPILER='/usr/bin/gcc-5' \
         -DCMAKE_C_FLAGS:STRING="${CFLAGS/-fno-plt/}" \
+        -DCMAKE_INSTALL_LIBDIR:PATH='lib' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DCMAKE_SKIP_INSTALL_RPATH:BOOL='NO' \
         -DCMAKE_SKIP_RPATH:BOOL='NO' \
@@ -170,7 +207,6 @@ build() {
         \
         -DCUDA_ARCH_NAME:STRING='Auto' \
         -DCUDA_64_BIT_DEVICE_CODE:BOOL='ON' \
-        -DCUDA_ARCH_NAME:STRING='Auto' \
         -DCUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE:BOOL='ON' \
         -DCUDA_BUILD_CUBIN:BOOL='OFF' \
         -DCUDA_BUILD_EMULATION:BOOL='OFF' \
@@ -192,30 +228,39 @@ build() {
         \
         -DOpenCV_DIR:PATH='/usr/share/OpenCV' \
         \
-        -DPYTHON_EXECUTABLE:FILEPATH='/usr/bin/python2.7' \
-        -DPYTHON_INCLUDE_DIR:PATH='/usr/include/python2.7' \
-        -DPYTHON_LIBRARY:FILEPATH='/usr/lib/libpython2.7.so' \
+        -DPYTHON_EXECUTABLE:FILEPATH="/usr/bin/python${_pythonver}" \
+        -DPYTHON_INCLUDE_DIR:PATH="/usr/include/python${_pythonver}m" \
+        -DPYTHON_LIBRARY:FILEPATH="/usr/lib/libpython${_pythonver}m.so" \
         \
-        -DUSE_CNMEM:BOOL='OFF' \
+        -DUSE_ACL:BOOL='OFF' \
+        -DUSE_ASAN:BOOL='OFF' \
+        -DUSE_ATEN:BOOL='OFF' \
         -DUSE_CUDA:BOOL='ON' \
+        -DUSE_FFMPEG:BOOL='ON' \
         -DUSE_GFLAGS:BOOL='ON' \
         -DUSE_GLOG:BOOL='ON' \
-        -DUSE_GLOO:BOOL='OFF' \
+        -DUSE_GLOO:BOOL='ON' \
         -DUSE_LEVELDB:BOOL='ON' \
         -DUSE_LITE_PROTO:BOOL='OFF' \
         -DUSE_LMDB:BOOL='ON' \
+        -DUSE_METAL:BOOL='OFF' \
+        -DUSE_MOBILE_OPENGL:BOOL='OFF' \
         -DUSE_MPI:BOOL='ON' \
         -DUSE_NCCL:BOOL='OFF' \
-        -DUSE_NERVANA_GPU:BOOL='ON' \
+        -DUSE_NERVANA_GPU:BOOL='OFF' \
+        -DUSE_NNAPI:BOOL='OFF' \
         -DUSE_NNPACK:BOOL='ON' \
+        -DUSE_NUMA:BOOL='ON' \
         -DUSE_OBSERVERS:BOOL='ON' \
         -DUSE_OPENCV:BOOL='OFF' \
-        -DUSE_FFMPEG:BOOL='ON' \
         -DUSE_OPENMP:BOOL='ON' \
+        -DUSE_PROF:BOOL='OFF' \
         -DUSE_REDIS:BOOL='ON' \
         -DUSE_ROCKSDB:BOOL='OFF' \
-        -DUSE_THREADS:BOOL='ON' \
+        -DUSE_SNPE:BOOL='OFF' \
+        -DUSE_TENSORRT:BOOL='OFF' \
         -DUSE_ZMQ:BOOL='ON' \
+        -DUSE_ZSTD:BOOL='ON' \
         \
         -Wno-dev \
         ..
@@ -230,25 +275,22 @@ build() {
 }
 
 package() {
-    cd "${pkgname}-${pkgver}/build"
+    cd "pytorch-${_ptver}/build"
     
     make DESTDIR="$pkgdir" install
     
-    # directories creation
-    mkdir -p "${pkgdir}/usr/lib/python2.7/site-packages"
-    mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-    
-    # move/rename folders to the right location
-    mv -f "${pkgdir}/usr/caffe"  "${pkgdir}/usr/lib/python2.7/site-packages"
-    mv -f "${pkgdir}/usr/caffe2" "${pkgdir}/usr/lib/python2.7/site-packages"
-    
-    # fix shebang in python scripts
-    cd "${pkgdir}/usr/lib/python2.7/site-packages/caffe2"
-    sed -i '1s/python$/python2/' python/allcompare_test.py
-    sed -i '1s/python$/python2/' contrib/gloo/gloo_test.py
+    # remove unneeded files
+    rm -rf "${pkgdir}/usr/include/google"
+    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/pkgconfig/{protobuf-lite,protobuf}.pc
+    rm -f "$pkgdir"/usr/share/pkgconfig/libzstd.pc
+    rm -f "$pkgdir"/usr/share/man/man1/{unzstd,zstd{cat,}}.1
     
     # license
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/pytorch-${_ptver}"
     install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -D -m644 PATENTS "${pkgdir}/usr/share/licenses/${pkgname}/PATENTS"
+    install -D -m644 NOTICE  "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
 }
diff --git a/caffe2-allow-cuda9.patch b/caffe2-allow-cuda9.patch
deleted file mode 100644
index 38b9ddb10c24..000000000000
--- a/caffe2-allow-cuda9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-caffe2-0.8.1
-[PATCH] Allow build with CUDA 9.0
-
-Backport of:
-https://github.com/caffe2/caffe2/commit/24d1038b2216e670b43032c93cc520c0a93423ba
-
-diff -Naurp a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
---- a/cmake/Dependencies.cmake	2017-08-08 17:57:43.000000000 +0000
-+++ b/cmake/Dependencies.cmake	2018-04-22 16:01:19.916213699 +0000
-@@ -283,16 +283,27 @@ endif()
- # ---[ CUDA
- if(USE_CUDA)
-   include(cmake/Cuda.cmake)
--  # CUDA 8.0 requires GCC 5
-   if(HAVE_CUDA)
--    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
--        NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
--      message(FATAL_ERROR
--        "CUDA 8.0 is not compatible with GCC version >= 6. "
--        "Use the following options to use another version (for example): \n"
--        "  -DCMAKE_CXX_COMPILER=/usr/bin/g++-5\n"
--        "  -DCMAKE_C_COMPILER=/usr/bin/gcc-5\n"
--        "  -DCUDA_HOST_COMPILER:FILEPATH=/usr/bin/gcc-5\n")
-+    # CUDA 9.0 requires GCC version <= 6
-+    if (CUDA_VERSION VERSION_EQUAL 9.0)
-+      if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
-+          NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0 AND
-+          CUDA_HOST_COMPILER STREQUAL CMAKE_C_COMPILER)
-+        message(FATAL_ERROR
-+          "CUDA 9.0 is not compatible with GCC version >= 7. "
-+          "Use the following option to use another version (for example): \n"
-+          "  -DCUDA_HOST_COMPILER=/usr/bin/gcc-6\n")
-+      endif()
-+    # CUDA 8.0 requires GCC version <= 5
-+    elseif (CUDA_VERSION VERSION_EQUAL 8.0)
-+      if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
-+          NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0 AND
-+          CUDA_HOST_COMPILER STREQUAL CMAKE_C_COMPILER)
-+        message(FATAL_ERROR
-+          "CUDA 8.0 is not compatible with GCC version >= 6. "
-+          "Use the following option to use another version (for example): \n"
-+          "  -DCUDA_HOST_COMPILER=/usr/bin/gcc-5\n")
-+      endif()
-     endif()
-   endif()
-   # ---[ CUDNN
diff --git a/caffe2-cuda9.1-fix.patch b/caffe2-cuda9.1-fix.patch
deleted file mode 100644
index d768b4aab707..000000000000
--- a/caffe2-cuda9.1-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit ef38db80540a1376e4187e52c0bfcf1b25e0770e
-Author: Daniel Bermond <danielbermond@yahoo.com>
-Date:   Sun Dec 24 11:16:39 2017 -0200
-
-    cmake: handle CUDA 9.1 in GCC version check
-    
-    GCC version check is currently being skiped when using the
-    newly released CUDA 9.1.
-    
-    This will also handle other CUDA 9.x minor releases if any,
-    reducing our work if there are such releases like 9.2. This
-    assumes that the next major CUDA version will be 10.0,
-    needing adjustment only after such major version is
-    released.
-
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 1371cabc..a323dc1b 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -326,13 +326,14 @@ endif()
- if(USE_CUDA)
-   include(cmake/Cuda.cmake)
-   if(HAVE_CUDA)
--    # CUDA 9.0 requires GCC version <= 6
--    if (CUDA_VERSION VERSION_EQUAL 9.0)
-+    # CUDA 9.x requires GCC version <= 6
-+    if ((CUDA_VERSION VERSION_EQUAL   9.0) OR
-+        (CUDA_VERSION VERSION_GREATER 9.0  AND CUDA_VERSION VERSION_LESS 10.0))
-       if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
-           NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0 AND
-           CUDA_HOST_COMPILER STREQUAL CMAKE_C_COMPILER)
-         message(FATAL_ERROR
--          "CUDA 9.0 is not compatible with GCC version >= 7. "
-+          "CUDA ${CUDA_VERSION} is not compatible with GCC version >= 7. "
-           "Use the following option to use another version (for example): \n"
-           "  -DCUDA_HOST_COMPILER=/usr/bin/gcc-6\n")
-       endif()
author	Daniel Bermond	2018-04-30 18:56:54 +0000
committer	Daniel Bermond	2018-04-30 18:56:54 +0000
commit	2dffebed28bc8fc6044cc0083e1398361104522d (patch)
tree	504b5940baef23f88dfe9ab49f57de87d7bbba92
parent	f6fdbe63cced38c7443b9553493377919710cf64 (diff)
download	aur-2dffebed28bc8fc6044cc0083e1398361104522d.tar.gz