Date: Thursday, October 4, 2018 @ 22:28:50 Author: svenstaro Revision: 389688
archrelease: copy trunk to community-x86_64 Added: python-pytorch/repos/community-x86_64/12116.patch (from rev 389687, python-pytorch/trunk/12116.patch) python-pytorch/repos/community-x86_64/PKGBUILD (from rev 389687, python-pytorch/trunk/PKGBUILD) python-pytorch/repos/community-x86_64/noplt.patch (from rev 389687, python-pytorch/trunk/noplt.patch) Deleted: python-pytorch/repos/community-x86_64/PKGBUILD python-pytorch/repos/community-x86_64/noplt.patch -------------+ 12116.patch | 70 +++++++++++ PKGBUILD | 354 +++++++++++++++++++++++++--------------------------------- noplt.patch | 26 ++-- 3 files changed, 238 insertions(+), 212 deletions(-) Copied: python-pytorch/repos/community-x86_64/12116.patch (from rev 389687, python-pytorch/trunk/12116.patch) =================================================================== --- 12116.patch (rev 0) +++ 12116.patch 2018-10-04 22:28:50 UTC (rev 389688) @@ -0,0 +1,70 @@ +From cea0d3269daf34fa32b55237d393de7c47928f65 Mon Sep 17 00:00:00 2001 +From: Xiaodong Wang <xdw...@fb.com> +Date: Wed, 26 Sep 2018 13:44:53 -0700 +Subject: [PATCH] Caffe 2 adoption + +Summary: +Adapt Caffe 2 to platform007 (gcc 8): +* gcc 8 + nvcc template symbol lookup (D9319742): +context_.template CopySameDevice<T> ==> this->context_.template CopySameDevice<T> +* New gcc 8 warning (error): + * -Werror=sizeof-pointer-div + * Unnecessary parenthesis + +Differential Revision: D10045844 + +fbshipit-source-id: 0b0569401fac69f83b8c2be758eea7c8fa18a019 +--- + aten/src/THC/generic/THCTensor.cpp | 2 +- + caffe2/operators/rnn/recurrent_op_cudnn.cc | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aten/src/THC/generic/THCTensor.cpp b/aten/src/THC/generic/THCTensor.cpp +index a7779047863..673870288e8 100644 +--- a/aten/src/THC/generic/THCTensor.cpp ++++ b/aten/src/THC/generic/THCTensor.cpp +@@ -596,7 +596,7 @@ int THCTensor_(checkGPU)(THCState *state, unsigned int nTensors, ...) + { + int curDev = -1; + THCudaCheck(cudaGetDevice(&curDev)); +- va_list(args); ++ va_list args; + va_start(args, nTensors); + int valid = 1; + for (unsigned int i = 0; i < nTensors; i++) { +diff --git a/caffe2/operators/rnn/recurrent_op_cudnn.cc b/caffe2/operators/rnn/recurrent_op_cudnn.cc +index 4b349655843..fa37874bd3e 100644 +--- a/caffe2/operators/rnn/recurrent_op_cudnn.cc ++++ b/caffe2/operators/rnn/recurrent_op_cudnn.cc +@@ -458,13 +458,13 @@ bool RecurrentParamAccessOp<T, mode>::RunOnDevice() { + if (mode == SET_PARAM) { + CAFFE_ENFORCE_EQ( + biasDims[0] * biasDims[1] * biasDims[2], Input(2).size()); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + biasDims[0] * biasDims[1] * biasDims[2], + Input(2).template data<T>(), + static_cast<T*>(bias)); + } else { + Output(0)->Resize(biasDims); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + biasDims[0] * biasDims[1] * biasDims[2], + static_cast<T*>(bias), + Output(0)->template mutable_data<T>()); +@@ -495,13 +495,13 @@ bool RecurrentParamAccessOp<T, mode>::RunOnDevice() { + CAFFE_ENFORCE_EQ(numDims, 3); + if (mode == SET_PARAM) { + CAFFE_ENFORCE_EQ(matDims[0] * matDims[1] * matDims[2], Input(2).size()); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + matDims[0] * matDims[1] * matDims[2], + Input(2).template data<T>(), + static_cast<T*>(pmatrix)); + } else { + Output(0)->Resize(matDims); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + matDims[0] * matDims[1] * matDims[2], + static_cast<T*>(pmatrix), + Output(0)->template mutable_data<T>()); Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-10-04 22:28:42 UTC (rev 389687) +++ PKGBUILD 2018-10-04 22:28:50 UTC (rev 389688) @@ -1,199 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Stephen Zhang <zsrkmyn at gmail dot com> - -pkgbase="python-pytorch" -pkgname=("python-pytorch" "python2-pytorch" "python-pytorch-cuda" "python2-pytorch-cuda") -_pkgname="pytorch" -_commit=a24163a -pkgver=0.4.1 -pkgrel=5 -pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration" -arch=('x86_64') -url="https://pytorch.org" -license=('BSD') -makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools' - 'python-yaml' 'python2-yaml' 'python-numpy' 'python2-numpy' - 'cmake' 'cuda' 'cudnn' 'git' 'python2-typing') -source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#commit=$_commit" - "git+https://github.com/catchorg/Catch2" - "git+https://github.com/ARM-software/ComputeLibrary" - "git+https://github.com/Maratyszcza/FP16" - "git+https://github.com/Maratyszcza/FXdiv" - "git+https://github.com/Maratyszcza/NNPACK" - "git+https://github.com/google/benchmark" - "git+https://github.com/Maratyszcza/cpuinfo" - "git+https://github.com/NVlabs/cub" - "git+https://github.com/eigenteam/eigen-git-mirror" - "git+https://github.com/facebookincubator/gloo" - "git+https://github.com/google/googletest" - "git+https://github.com/Yangqing/ios-cmake" - "git+https://github.com/nanopb/nanopb" - "git+https://github.com/NervanaSystems/nervanagpu" - "git+https://github.com/nvidia/nccl" - "git+https://github.com/onnx/onnx" - "git+https://github.com/google/protobuf" - "git+https://github.com/Maratyszcza/psimd" - "git+https://github.com/Maratyszcza/pthreadpool" - "git+https://github.com/pybind/pybind11" - "git+https://github.com/PeachPy/enum34" - "git+https://github.com/Maratyszcza/PeachPy" - "git+https://github.com/benjaminp/six" - "git+https://github.com/facebook/zstd" - noplt.patch) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '8e845663abbbd78bd4d3fcb8997b85c644a09470b166ed3a95429636670eb4ef') - -prepare() { - cd "${_pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}"/noplt.patch - - git submodule init - git config submodule."third-party/cpuinfo".url "${srcdir}"/cpuinfo - git config submodule."third_party/catch".url "${srcdir}"/Catch2 - git config submodule."third_party/nanopb".url "${srcdir}"/nanopb - git config submodule."third_party/pybind11".url "${srcdir}"/pybind11 - git config submodule."third_party/nccl".url "${srcdir}"/nccl - git config submodule."third_party/cub".url "${srcdir}"/cub - git config submodule."third_party/eigen".url "${srcdir}"/eigen-git-mirror - git config submodule."third_party/googletest".url "${srcdir}"/googletest - git config submodule."third_party/nervanagpu".url "${srcdir}"/nervanagpu - git config submodule."third_party/benchmark".url "${srcdir}"/benchmark - git config submodule."third_party/protobuf".url "${srcdir}"/protobuf - git config submodule."third_party/ios-cmake".url "${srcdir}"/ios-cmake - git config submodule."third_party/NNPACK".url "${srcdir}"/NNPACK - git config submodule."third_party/gloo".url "${srcdir}"/gloo - git config submodule."third_party/NNPACK_deps/pthread_ool".url "${srcdir}"/pthreadpool - git config submodule."third_party/NNPACK_deps/FXdiv".url "${srcdir}"/FXdiv - git config submodule."third_party/NNPACK_deps/FP16".url "${srcdir}"/FP16 - git config submodule."third_party/NNPACK_deps/psimd".url "${srcdir}"/psimd - git config submodule."third_party/zstd".url "${srcdir}"/zstd - git config submodule."third_party/cpuinfo".url "${srcdir}"/cpuinfo - git config submodule."third_party/python-enum".url "${srcdir}"/enum34 - git config submodule."third_party/python-peachpy".url "${srcdir}"/PeachPy - git config submodule."third_party/python-six".url "${srcdir}"/six - git config submodule."third_party/ComputeLibrary".url "${srcdir}"/ComputeLibrary - git config submodule."third_party/onnx".url "${srcdir}"/onnx - git submodule update - - cd .. - - cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py2" - cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py3" - cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py2-cuda" - cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py3-cuda" -} - -build() { - msg2 "Building Python 2 without cuda" - cd "$srcdir/${_pkgname}-${pkgver}-py2" - # Uncomment and modify the following line to enable Intel MKL and magma support - #CMAKE_PREFIX_PATH=/opt/intel/mkl/include:/opt/intel/mkl/lib/intel64:/opt/magma \ - CFLAGS="${CFLAGS/-fno-plt/}" \ - CXXFLAGS="${CXXFLAGS/-fno-plt/}" \ - NO_CUDA=1 \ - WITH_CUDA=0 \ - WITH_CUDNN=0 \ - python2 setup.py build - - msg2 "Building Python 3 without cuda" - cd "$srcdir/${_pkgname}-${pkgver}-py3" - # Uncomment and modify the following line to enable Intel MKL and magma support - #CMAKE_PREFIX_PATH=/opt/intel/mkl/include:/opt/intel/mkl/lib/intel64:/opt/magma \ - CFLAGS="${CFLAGS/-fno-plt/}" \ - CXXFLAGS="${CXXFLAGS/-fno-plt/}" \ - NO_CUDA=1 \ - WITH_CUDA=0 \ - WITH_CUDNN=0 \ - python setup.py build - - msg2 "Building Python 2 with cuda" - cd "$srcdir/${_pkgname}-${pkgver}-py2-cuda" - # Uncomment and modify the following line to enable Intel MKL and magma support - #CMAKE_PREFIX_PATH=/opt/intel/mkl/include:/opt/intel/mkl/lib/intel64:/opt/magma \ - CFLAGS="${CFLAGS/-fno-plt/}" \ - CXXFLAGS="${CXXFLAGS/-fno-plt/}" \ - CC=gcc-7 \ - CXX=g++-7 \ - WITH_CUDA=1 \ - CUDA_HOME=/opt/cuda \ - WITH_CUDNN=1 \ - CUDNN_LIB_DIR=/opt/cuda/lib64 \ - CUDNN_INCLUDE_DIR=/opt/cuda/include \ - TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__" \ - python2 setup.py build - - msg2 "Building Python 3 with cuda" - cd "$srcdir/${_pkgname}-${pkgver}-py3-cuda" - # Uncomment and modify the following line to enable Intel MKL and magma support - #CMAKE_PREFIX_PATH=/opt/intel/mkl/include:/opt/intel/mkl/lib/intel64:/opt/magma \ - CFLAGS="${CFLAGS/-fno-plt/}" \ - CXXFLAGS="${CXXFLAGS/-fno-plt/}" \ - CC=gcc-7 \ - CXX=g++-7 \ - WITH_CUDA=1 \ - CUDA_HOME=/opt/cuda \ - WITH_CUDNN=1 \ - CUDNN_LIB_DIR=/opt/cuda/lib64 \ - CUDNN_INCLUDE_DIR=/opt/cuda/include \ - TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__" \ - python setup.py build -} - -package_python2-pytorch() { - depends+=('python2' 'python2-yaml' 'python2-numpy' 'python2-typing') - cd "$srcdir/${_pkgname}-${pkgver}-py2" - python2 setup.py install --root="$pkgdir"/ --optimize=1 --skip-build - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" -} - -package_python-pytorch() { - depends+=('python' 'python-yaml' 'python-numpy') - cd "$srcdir/${_pkgname}-${pkgver}-py3" - python setup.py install --root="$pkgdir"/ --optimize=1 --skip-build - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" -} - -package_python2-pytorch-cuda() { - depends+=('python2' 'python2-yaml' 'python2-numpy' 'cuda' 'cudnn' 'python2-typing') - provides=('python2-pytorch') - conflicts=('python2-pytorch') - cd "$srcdir/${_pkgname}-${pkgver}-py2-cuda" - python2 setup.py install --root="$pkgdir"/ --optimize=1 --skip-build - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" -} - -package_python-pytorch-cuda() { - depends+=('python' 'python-yaml' 'python-numpy' 'cuda' 'cudnn') - provides=('python-pytorch') - conflicts=('python-pytorch') - cd "$srcdir/${_pkgname}-${pkgver}-py3-cuda" - python setup.py install --root="$pkgdir"/ --optimize=1 --skip-build - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" -} - -# vim:set ts=2 sw=2 et: Copied: python-pytorch/repos/community-x86_64/PKGBUILD (from rev 389687, python-pytorch/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-10-04 22:28:50 UTC (rev 389688) @@ -0,0 +1,155 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Stephen Zhang <zsrkmyn at gmail dot com> + +pkgbase="python-pytorch" +pkgname=("python-pytorch" "python-pytorch-cuda") +_pkgname="pytorch" +pkgver=1.0rc1 +pkgrel=1 +pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration" +arch=('x86_64') +url="https://pytorch.org" +license=('BSD') +depends=('python' 'python-yaml' 'python-numpy' 'opencv') +makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda' 'cudnn' 'git' 'nccl') +source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$pkgver" + "git+https://github.com/catchorg/Catch2" + "git+https://github.com/pybind/pybind11" + "git+https://github.com/NVlabs/cub" + "git+https://github.com/eigenteam/eigen-git-mirror" + "git+https://github.com/google/googletest" + "git+https://github.com/NervanaSystems/nervanagpu" + "git+https://github.com/google/benchmark" + "git+https://github.com/google/protobuf" + "git+https://github.com/Yangqing/ios-cmake" + "git+https://github.com/Maratyszcza/NNPACK" + "git+https://github.com/facebookincubator/gloo" + "git+https://github.com/Maratyszcza/pthreadpool" + "git+https://github.com/Maratyszcza/FXdiv" + "git+https://github.com/Maratyszcza/FP16" + "git+https://github.com/Maratyszcza/psimd" + "git+https://github.com/facebook/zstd" + "git+https://github.com/Maratyszcza/cpuinfo" + "git+https://github.com/PeachPy/enum34" + "git+https://github.com/Maratyszcza/PeachPy" + "git+https://github.com/benjaminp/six" + "git+https://github.com/ARM-software/ComputeLibrary" + "git+https://github.com/onnx/onnx" + "git+https://github.com/USCILab/cereal" + "git+https://github.com/onnx/onnx-tensorrt" + "git+https://github.com/shibatch/sleef" + "git+https://github.com/intel/ideep" + 12116.patch + ) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '2a2cd21dbdf7253185c8835a3f36b543a4b1655d837e01f7cfd27ab81819f2d5') + +prepare() { + cd "${_pkgname}-${pkgver}" + + # patch -Np1 -i "${srcdir}"/noplt.patch + patch -Np1 -i "${srcdir}"/12116.patch + + git submodule init + git config submodule."third_party/catch".url "${srcdir}"/Catch2 + git config submodule."third_party/pybind11".url "${srcdir}"/pybind11 + git config submodule."third_party/cub".url "${srcdir}"/cub + git config submodule."third_party/eigen".url "${srcdir}"/eigen-git-mirror + git config submodule."third_party/googletest".url "${srcdir}"/googletest + git config submodule."third_party/nervanagpu".url "${srcdir}"/nervanagpu + git config submodule."third_party/benchmark".url "${srcdir}"/benchmark + git config submodule."third_party/protobuf".url "${srcdir}"/protobuf + git config submodule."third_party/ios-cmake".url "${srcdir}"/ios-cmake + git config submodule."third_party/NNPACK".url "${srcdir}"/NNPACK + git config submodule."third_party/gloo".url "${srcdir}"/gloo + git config submodule."third_party/NNPACK_deps/pthread_ool".url "${srcdir}"/pthreadpool + git config submodule."third_party/NNPACK_deps/FXdiv".url "${srcdir}"/FXdiv + git config submodule."third_party/NNPACK_deps/FP16".url "${srcdir}"/FP16 + git config submodule."third_party/NNPACK_deps/psimd".url "${srcdir}"/psimd + git config submodule."third_party/zstd".url "${srcdir}"/zstd + git config submodule."third_party/cpuinfo".url "${srcdir}"/cpuinfo + git config submodule."third_party/python-enum".url "${srcdir}"/enum34 + git config submodule."third_party/python-peachpy".url "${srcdir}"/PeachPy + git config submodule."third_party/python-six".url "${srcdir}"/six + git config submodule."third_party/ComputeLibrary".url "${srcdir}"/ComputeLibrary + git config submodule."third_party/onnx".url "${srcdir}"/onnx + git config submodule."third_party/cereal".url "${srcdir}"/cereal + git config submodule."third_party/onnx-tensorrt".url "${srcdir}"/onnx-tensorrt + git config submodule."third_party/sleef".url "${srcdir}"/sleef + git config submodule."third_party/ideep".url "${srcdir}"/ideep + git submodule update + + cd .. + + cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-cuda" +} + +build() { + # Uncomment and modify the following line to enable Intel MKL and magma support + # export CMAKE_PREFIX_PATH=/opt/intel/mkl/include:/opt/intel/mkl/lib/intel64:/opt/magma \ + + msg2 "Building without cuda" + export NO_CUDA=1 + export WITH_CUDNN=0 + # export USE_OPENCV=1 + # export BUILD_BINARY=1 + + cd "$srcdir/${_pkgname}-${pkgver}" + python setup.py build + + msg2 "Building with cuda" + export CC=gcc-7 + export CXX=g++-7 + export NO_CUDA=0 + export CUDAHOSTCXX=g++-7 + export CUDA_HOME=/opt/cuda + export CUDNN_LIB_DIR=/opt/cuda/lib64 + export CUDNN_INCLUDE_DIR=/opt/cuda/include + # export TORCH_CUDA_ARCH_LIST="3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5" + + cd "$srcdir/${_pkgname}-${pkgver}-cuda" + python setup.py build +} + +package_python-pytorch() { + cd "$srcdir/${_pkgname}-${pkgver}" + python setup.py install --root="$pkgdir"/ --optimize=1 --skip-build + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" +} + +package_python-pytorch-cuda() { + depends+=('cuda' 'cudnn') + provides=('python-pytorch') + conflicts=('python-pytorch') + cd "$srcdir/${_pkgname}-${pkgver}-cuda" + python setup.py install --root="$pkgdir"/ --optimize=1 --skip-build + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" +} + +# vim:set ts=2 sw=2 et: Deleted: noplt.patch =================================================================== --- noplt.patch 2018-10-04 22:28:42 UTC (rev 389687) +++ noplt.patch 2018-10-04 22:28:50 UTC (rev 389688) @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 4fff8702d..cd2b19aab 100644 ---- a/setup.py -+++ b/setup.py -@@ -182,7 +182,7 @@ import distutils.sysconfig - cfg_vars = distutils.sysconfig.get_config_vars() - for key, value in cfg_vars.items(): - if type(value) == str: -- cfg_vars[key] = value.replace("-Wstrict-prototypes", "") -+ cfg_vars[key] = value.replace("-Wstrict-prototypes", "").replace("-fno-plt", "") - - ################################################################################ - # Custom build commands Copied: python-pytorch/repos/community-x86_64/noplt.patch (from rev 389687, python-pytorch/trunk/noplt.patch) =================================================================== --- noplt.patch (rev 0) +++ noplt.patch 2018-10-04 22:28:50 UTC (rev 389688) @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 4fff8702d..cd2b19aab 100644 +--- a/setup.py ++++ b/setup.py +@@ -182,7 +182,7 @@ import distutils.sysconfig + cfg_vars = distutils.sysconfig.get_config_vars() + for key, value in cfg_vars.items(): + if type(value) == str: +- cfg_vars[key] = value.replace("-Wstrict-prototypes", "") ++ cfg_vars[key] = value.replace("-Wstrict-prototypes", "").replace("-fno-plt", "") + + ################################################################################ + # Custom build commands