[arch-commits] Commit in python-pytorch/repos/community-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Dec 6 04:22:08 UTC 2017
Date: Wednesday, December 6, 2017 @ 04:22:07
Author: svenstaro
Revision: 272388
archrelease: copy trunk to community-x86_64
Added:
python-pytorch/repos/community-x86_64/2334.patch
(from rev 272387, python-pytorch/trunk/2334.patch)
python-pytorch/repos/community-x86_64/PKGBUILD
(from rev 272387, python-pytorch/trunk/PKGBUILD)
Deleted:
python-pytorch/repos/community-x86_64/2334.patch
python-pytorch/repos/community-x86_64/PKGBUILD
------------+
2334.patch | 42 ++++-----
PKGBUILD | 273 ++++++++++++++++++++++++++++++-----------------------------
2 files changed, 164 insertions(+), 151 deletions(-)
Deleted: 2334.patch
===================================================================
--- 2334.patch 2017-12-06 04:21:50 UTC (rev 272387)
+++ 2334.patch 2017-12-06 04:22:07 UTC (rev 272388)
@@ -1,21 +0,0 @@
-From 5e2b1b975bf758b67a190444a1d4a6f18c997095 Mon Sep 17 00:00:00 2001
-From: Mo Zhou <cdluminate at gmail.com>
-Date: Tue, 8 Aug 2017 09:58:23 +0000
-Subject: [PATCH] THD: add a missing header to fix build failure
-
----
- torch/lib/THD/base/ChannelUtils.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/torch/lib/THD/base/ChannelUtils.hpp b/torch/lib/THD/base/ChannelUtils.hpp
-index 563e68297e..e03e8bd132 100644
---- a/torch/lib/THD/base/ChannelUtils.hpp
-+++ b/torch/lib/THD/base/ChannelUtils.hpp
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <cstdlib>
- #include <cstdint>
-+#include <functional>
- #include <limits>
- #include <string>
- #include <system_error>
Copied: python-pytorch/repos/community-x86_64/2334.patch (from rev 272387, python-pytorch/trunk/2334.patch)
===================================================================
--- 2334.patch (rev 0)
+++ 2334.patch 2017-12-06 04:22:07 UTC (rev 272388)
@@ -0,0 +1,21 @@
+From 5e2b1b975bf758b67a190444a1d4a6f18c997095 Mon Sep 17 00:00:00 2001
+From: Mo Zhou <cdluminate at gmail.com>
+Date: Tue, 8 Aug 2017 09:58:23 +0000
+Subject: [PATCH] THD: add a missing header to fix build failure
+
+---
+ torch/lib/THD/base/ChannelUtils.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/torch/lib/THD/base/ChannelUtils.hpp b/torch/lib/THD/base/ChannelUtils.hpp
+index 563e68297e..e03e8bd132 100644
+--- a/torch/lib/THD/base/ChannelUtils.hpp
++++ b/torch/lib/THD/base/ChannelUtils.hpp
+@@ -5,6 +5,7 @@
+ #include <sys/types.h>
+ #include <cstdlib>
+ #include <cstdint>
++#include <functional>
+ #include <limits>
+ #include <string>
+ #include <system_error>
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-06 04:21:50 UTC (rev 272387)
+++ PKGBUILD 2017-12-06 04:22:07 UTC (rev 272388)
@@ -1,130 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at 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"
-pkgver=0.2.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'
- 'gcc6' 'cmake' 'cuda' 'cudnn')
-source=("https://github.com/pytorch/pytorch/archive/v${pkgver}.tar.gz"
- "nccl.tar.gz::https://github.com/NVIDIA/nccl/archive/29a1a916dc14bb2c00feed3d4820d51fa85be1e6.tar.gz"
- 2334.patch)
-sha256sums=('b76d61aaa8fc18b928ca3c910c398687be08f5661d6615884c4faba3e8742a26'
- '6387030e37d14762f87eefbc86ee527293ec04745c66ccd820cf7fc0fdc23f92'
- '1933b0e73785cc3d24013815c79f36267380239f2cbf0561b7702e0d5af61daf')
-
-prepare() {
- cd "${_pkgname}-${pkgver}"
- sed -i -e '144icp -r nccl gloo/third-party/' torch/lib/build_all.sh
- sed -i -e '470,475d' setup.py
-
- # Hack to build with new cuda 9
- rm -r torch/lib/nccl/src
- cp -r "${srcdir}"/nccl-*/* torch/lib/nccl
-
- patch -Np1 < ${srcdir}/2334.patch
-
- 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="${CFLAGS/-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="${CFLAGS/-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 \
- CC=gcc-6 \
- CXX=g++-6 \
- CFLAGS="${CFLAGS/-fno-plt/}" \
- CXXFLAGS="${CFLAGS/-fno-plt/}" \
- 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 \
- CC=gcc-6 \
- CXX=g++-6 \
- CFLAGS="${CFLAGS/-fno-plt/}" \
- CXXFLAGS="${CFLAGS/-fno-plt/}" \
- 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')
- 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')
- optdepends=('cuda' 'cudnn')
- 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')
- optdepends=('cuda' 'cudnn')
- 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 272387, python-pytorch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-12-06 04:22:07 UTC (rev 272388)
@@ -0,0 +1,143 @@
+# Maintainer: Sven-Hendrik Haase <sh at 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"
+pkgver=0.3.0
+pkgrel=1
+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'
+ 'gcc6' 'cmake' 'cuda' 'cudnn' 'git')
+source=("${_pkgname}-${pkgver}::git://github.com/pytorch/pytorch.git#tag=v${pkgver}"
+ "git://github.com/facebookincubator/gloo"
+ "git://github.com/pybind/pybind11"
+ "git://github.com/nanopb/nanopb"
+ "nccl.tar.gz::https://github.com/NVIDIA/nccl/archive/29a1a916dc14bb2c00feed3d4820d51fa85be1e6.tar.gz"
+ 2334.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '6387030e37d14762f87eefbc86ee527293ec04745c66ccd820cf7fc0fdc23f92'
+ '1933b0e73785cc3d24013815c79f36267380239f2cbf0561b7702e0d5af61daf')
+
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+
+ git submodule init
+ git config submodule."torch/lib/gloo".url ${srcdir}/gloo
+ git config submodule."torch/lib/pybind11".url ${srcdir}/pybind11
+ git config submodule."torch/lib/nanopb".url ${srcdir}/nanopb
+ git submodule update
+
+ # sed -i -e '144icp -r nccl gloo/third-party/' torch/lib/build_all.sh
+ # sed -i -e '470,475d' setup.py
+
+ # Hack to build with new cuda 9
+ # rm -r torch/lib/nccl/src
+ # cp -r "${srcdir}"/nccl-*/* torch/lib/nccl
+
+ # patch -Np1 < ${srcdir}/2334.patch
+
+ 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="${CFLAGS/-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="${CFLAGS/-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 \
+ CC=gcc-6 \
+ CXX=g++-6 \
+ CFLAGS="${CFLAGS/-fno-plt/}" \
+ CXXFLAGS="${CFLAGS/-fno-plt/}" \
+ 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 \
+ CC=gcc-6 \
+ CXX=g++-6 \
+ CFLAGS="${CFLAGS/-fno-plt/}" \
+ CXXFLAGS="${CFLAGS/-fno-plt/}" \
+ 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')
+ 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')
+ optdepends=('cuda' 'cudnn')
+ 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')
+ optdepends=('cuda' 'cudnn')
+ 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:
More information about the arch-commits
mailing list