Date: Monday, July 30, 2018 @ 20:56:26 Author: eschwartz Revision: 365001
archrelease: copy trunk to community-x86_64 Added: python-pytorch/repos/community-x86_64/PKGBUILD (from rev 365000, python-pytorch/trunk/PKGBUILD) python-pytorch/repos/community-x86_64/noplt.patch (from rev 365000, python-pytorch/trunk/noplt.patch) Deleted: python-pytorch/repos/community-x86_64/PKGBUILD python-pytorch/repos/community-x86_64/noplt.patch -------------+ PKGBUILD | 404 +++++++++++++++++++++++++++++----------------------------- noplt.patch | 26 +-- 2 files changed, 215 insertions(+), 215 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-07-30 20:56:01 UTC (rev 365000) +++ PKGBUILD 2018-07-30 20:56:26 UTC (rev 365001) @@ -1,202 +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=200fb22 -pkgver=0.4.0 -pkgrel=4 -pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration" -arch=('x86_64') -url="http://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://github.com/01org/tbb" - "git://github.com/catchorg/Catch2" - "git://github.com/ARM-software/ComputeLibrary" - "git://github.com/Maratyszcza/FP16" - "git://github.com/Maratyszcza/FXdiv" - "git://github.com/Maratyszcza/NNPACK" - "git://github.com/google/benchmark" - "git://github.com/Maratyszcza/cpuinfo" - "git://github.com/NVlabs/cub" - "git://github.com/eigenteam/eigen-git-mirror" - "git://github.com/facebookincubator/gloo" - "git://github.com/google/googletest" - "git://github.com/Yangqing/ios-cmake" - "git://github.com/nanopb/nanopb" - "git://github.com/NervanaSystems/nervanagpu" - "git://github.com/nvidia/nccl" - "git://github.com/onnx/onnx" - "git://github.com/google/protobuf" - "git://github.com/Maratyszcza/psimd" - "git://github.com/Maratyszcza/pthreadpool" - "git://github.com/pybind/pybind11" - "git://github.com/PeachPy/enum34" - "git://github.com/Maratyszcza/PeachPy" - "git://github.com/benjaminp/six" - "git://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' - 'SKIP' - '8e845663abbbd78bd4d3fcb8997b85c644a09470b166ed3a95429636670eb4ef') - -prepare() { - cd "${_pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}"/noplt.patch - - git submodule init - git config submodule."aten/src/ATen/cpu/cpuinfo".url ${srcdir}/cpuinfo - git config submodule."aten/src/ATen/cpu/tbb/tbb_remote".url ${srcdir}/tbb - git config submodule."aten/src/ATen/utils/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 365000, python-pytorch/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-07-30 20:56:26 UTC (rev 365001) @@ -0,0 +1,202 @@ +# 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=200fb22 +pkgver=0.4.1 +pkgrel=2 +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/01org/tbb" + "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' + 'SKIP' + '8e845663abbbd78bd4d3fcb8997b85c644a09470b166ed3a95429636670eb4ef') + +prepare() { + cd "${_pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}"/noplt.patch + + git submodule init + git config submodule."aten/src/ATen/cpu/cpuinfo".url "${srcdir}"/cpuinfo + git config submodule."aten/src/ATen/cpu/tbb/tbb_remote".url "${srcdir}"/tbb + git config submodule."aten/src/ATen/utils/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: Deleted: noplt.patch =================================================================== --- noplt.patch 2018-07-30 20:56:01 UTC (rev 365000) +++ noplt.patch 2018-07-30 20:56:26 UTC (rev 365001) @@ -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 365000, python-pytorch/trunk/noplt.patch) =================================================================== --- noplt.patch (rev 0) +++ noplt.patch 2018-07-30 20:56:26 UTC (rev 365001) @@ -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