[arch-commits] Commit in python-pytorch/repos/community-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Jun 12 08:17:03 UTC 2019
Date: Wednesday, June 12, 2019 @ 08:17:02
Author: svenstaro
Revision: 480629
archrelease: copy trunk to community-x86_64
Added:
python-pytorch/repos/community-x86_64/PKGBUILD
(from rev 480628, python-pytorch/trunk/PKGBUILD)
python-pytorch/repos/community-x86_64/change_default_config.patch
(from rev 480628, python-pytorch/trunk/change_default_config.patch)
Deleted:
python-pytorch/repos/community-x86_64/PKGBUILD
python-pytorch/repos/community-x86_64/change_default_config.patch
-----------------------------+
PKGBUILD | 309 ++++++++++++++++++++++--------------------
change_default_config.patch | 56 +++----
2 files changed, 196 insertions(+), 169 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-12 08:16:49 UTC (rev 480628)
+++ PKGBUILD 2019-06-12 08:17:02 UTC (rev 480629)
@@ -1,141 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Stephen Zhang <zsrkmyn at gmail dot com>
-
-pkgbase="python-pytorch"
-pkgname=("python-pytorch" "python-pytorch-cuda")
-_pkgname="pytorch"
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
-arch=('x86_64')
-url="https://pytorch.org"
-license=('BSD')
-depends=('google-glog' 'gflags' 'opencv' 'openmp' 'nccl' 'pybind11' 'python' 'python-yaml' 'python-numpy' 'protobuf')
-makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda' 'cudnn' 'git')
-source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$pkgver"
- 'change_default_config.patch')
-sha256sums=('SKIP'
- '36fa08167c5a54c2ae7e5b67b750d35f7a1b3812fa90153d66f6aa2fce71f2b4')
-
-get_pyver () {
- python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
-}
-
-prepare() {
- cd "${_pkgname}-${pkgver}"
-
- # Change default config manually, as setup.py filters some flags
- patch -Np1 -i "${srcdir}/change_default_config.patch"
-
- # This is the lazy way since pytorch has sooo many submodules and they keep
- # changing them around but we've run into more problems so far doing it the
- # manual than the lazy way. This lazy way (not explicitly specifying all
- # submodules) will make building inefficient but for now I'll take it.
- # It will result in the same package, don't worry.
- git submodule update --init --recursive
-
- cd ..
-
- cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-cuda"
-}
-
-build() {
- export CC=gcc
- export CXX=g++
- export PYTORCH_BUILD_VERSION="${pkgver}"
- export PYTORCH_BUILD_NUMBER=1
- export USE_MKLDNN=0
-
- echo "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
-
- echo "Building with cuda"
- export NO_CUDA=0
- export WITH_CUDNN=1
- export CUDAHOSTCXX=g++
- export CUDA_HOME=/opt/cuda
- export CUDNN_LIB_DIR=/usr/lib
- export CUDNN_INCLUDE_DIR=/usr/include
- export TORCH_NVCC_FLAGS="-Xfatbin -compress-all"
- 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}"
- # Prevent setup.py from re-running CMake and rebuilding
- sed -e 's/RUN_BUILD_DEPS = True/RUN_BUILD_DEPS = False/g' -i setup.py
- python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
- # put CMake files in correct place
- install -d "${pkgdir}/usr/lib/cmake"
- pytorchpath="usr/lib/python$(get_pyver)/site-packages/torch"
- mv "${pkgdir}/${pytorchpath}/share/cmake"/* \
- "${pkgdir}/usr/lib/cmake/"
- # put C++ API in correct place
- install -d "${pkgdir}/usr/include"
- install -d "${pkgdir}/usr/lib/pytorch"
- mv "${pkgdir}/${pytorchpath}/include"/* "${pkgdir}/usr/include/"
- mv "${pkgdir}/${pytorchpath}/lib"/*.so* "${pkgdir}/usr/lib/pytorch/"
- # clean up duplicates
- # TODO: move towards direct shared library dependecy of:
- # c10, caffe2, libcpuinfo, CUDA RT, gloo, GTest, Intel MKL,
- # NVRTC, ONNX, protobuf, libthreadpool, QNNPACK
- rm -rf "${pkgdir}/${pytorchpath}/share/cmake"
- rm -rf "${pkgdir}/${pytorchpath}/include"
- rm -rf "${pkgdir}/usr/include/pybind11"
- # python module is hardcoded to look there at runtime
- ln -s /usr/include "${pkgdir}/${pytorchpath}/include"
- find "${pkgdir}"/usr/lib/pytorch -type f -name "*.so*" -print0 | while read -rd $'\0' _lib; do
- ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/"
- done
- # ldconfig
- install -d "${pkgdir}/etc/ld.so.conf.d"
- echo '/usr/lib/pytorch' > "${pkgdir}/etc/ld.so.conf.d/pytorch.conf"
-}
-
-package_python-pytorch-cuda() {
- depends+=('cuda' 'cudnn')
- provides=('python-pytorch')
- conflicts=('python-pytorch')
- cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
- # Prevent setup.py from re-running CMake and rebuilding
- sed -e 's/RUN_BUILD_DEPS = True/RUN_BUILD_DEPS = False/g' -i setup.py
- python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
- # put CMake files in correct place
- install -d "${pkgdir}/usr/lib/cmake"
- pytorchpath="usr/lib/python$(get_pyver)/site-packages/torch"
- mv "${pkgdir}/${pytorchpath}/share/cmake"/* \
- "${pkgdir}/usr/lib/cmake/"
- # put C++ API in correct place
- install -d "${pkgdir}/usr/include"
- install -d "${pkgdir}/usr/lib/pytorch"
- mv "${pkgdir}/${pytorchpath}/include"/* "${pkgdir}/usr/include/"
- mv "${pkgdir}/${pytorchpath}/lib"/*.so* "${pkgdir}/usr/lib/pytorch/"
- # clean up duplicates
- # TODO: move towards direct shared library dependecy of:
- # c10, caffe2, libcpuinfo, CUDA RT, gloo, GTest, Intel MKL,
- # NVRTC, ONNX, protobuf, libthreadpool, QNNPACK
- rm -rf "${pkgdir}/${pytorchpath}/share/cmake"
- rm -rf "${pkgdir}/${pytorchpath}/include"
- rm -rf "${pkgdir}/usr/include/pybind11"
- # python module is hardcoded to look there at runtime
- ln -s /usr/include "${pkgdir}/${pytorchpath}/include"
- find "${pkgdir}"/usr/lib/pytorch -type f -name "*.so*" -print0 | while read -rd $'\0' _lib; do
- ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/"
- done
- # ldconfig
- install -d "${pkgdir}/etc/ld.so.conf.d"
- echo '/usr/lib/pytorch' > "${pkgdir}/etc/ld.so.conf.d/pytorch.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: python-pytorch/repos/community-x86_64/PKGBUILD (from rev 480628, python-pytorch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-12 08:17:02 UTC (rev 480629)
@@ -0,0 +1,168 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Stephen Zhang <zsrkmyn at gmail dot com>
+
+pkgbase="python-pytorch"
+pkgname=("python-pytorch" "python-pytorch-opt" "python-pytorch-cuda" "python-pytorch-opt-cuda")
+_pkgname="pytorch"
+pkgver=1.1.0
+pkgrel=2
+pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
+arch=('x86_64')
+url="https://pytorch.org"
+license=('BSD')
+depends=('google-glog' 'gflags' 'opencv' 'openmp' 'nccl' 'pybind11' 'python' 'python-yaml' 'python-numpy' 'protobuf')
+makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda' 'cudnn' 'git')
+source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$pkgver")
+sha256sums=('SKIP')
+
+get_pyver () {
+ python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
+}
+
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+
+ # This is the lazy way since pytorch has sooo many submodules and they keep
+ # changing them around but we've run into more problems so far doing it the
+ # manual than the lazy way. This lazy way (not explicitly specifying all
+ # submodules) will make building inefficient but for now I'll take it.
+ # It will result in the same package, don't worry.
+ git submodule update --init --recursive
+
+ cd ..
+
+ cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt"
+ cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-cuda"
+ cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt-cuda"
+
+ export CC=gcc
+ export CXX=g++
+ export PYTORCH_BUILD_VERSION="${pkgver}"
+ export PYTORCH_BUILD_NUMBER=1
+ export USE_MKLDNN=0
+ # export BUILD_CUSTOM_PROTOBUF=0
+ # export BUILD_SHARED_LIBS=0
+ export USE_GFLAGS=1
+ export USE_GLOG=1
+ export BUILD_BINARY=1
+ export USE_OPENCV=1
+ export USE_SYSTEM_NCCL=1
+}
+
+build() {
+ echo "Building without cuda and without non-x86-64 optimizations"
+ export NO_CUDA=1
+ export WITH_CUDNN=0
+
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ sed -i "s/march=native/march=x86-64/g" cmake/MiscCheck.cmake
+ python setup.py build
+
+
+ echo "Building without cuda and with non-x86-64 optimizations"
+ export NO_CUDA=1
+ export WITH_CUDNN=0
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt"
+ sed -i "s/march=native/march=haswell/g" cmake/MiscCheck.cmake
+ python setup.py build
+
+
+ echo "Building with cuda and without non-x86-64 optimizations"
+ export NO_CUDA=0
+ export WITH_CUDNN=1
+ export CUDAHOSTCXX=g++
+ export CUDA_HOME=/opt/cuda
+ export CUDNN_LIB_DIR=/usr/lib
+ export CUDNN_INCLUDE_DIR=/usr/include
+ export TORCH_NVCC_FLAGS="-Xfatbin -compress-all"
+ 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"
+ sed -i "s/march=native/march=x86-64/g" cmake/MiscCheck.cmake
+ python setup.py build
+
+
+ echo "Building with cuda and without non-x86-64 optimizations"
+ export NO_CUDA=0
+ export WITH_CUDNN=1
+ export CUDAHOSTCXX=g++
+ export CUDA_HOME=/opt/cuda
+ export CUDNN_LIB_DIR=/usr/lib
+ export CUDNN_INCLUDE_DIR=/usr/include
+ export TORCH_NVCC_FLAGS="-Xfatbin -compress-all"
+ 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}-opt-cuda"
+ sed -i "s/march=native/march=haswell/g" cmake/MiscCheck.cmake
+ python setup.py build
+}
+
+_package() {
+ # Prevent setup.py from re-running CMake and rebuilding
+ sed -e 's/RUN_BUILD_DEPS = True/RUN_BUILD_DEPS = False/g' -i setup.py
+
+ python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+
+ # put CMake files in correct place
+ install -d "${pkgdir}/usr/lib/cmake"
+ pytorchpath="usr/lib/python$(get_pyver)/site-packages/torch"
+ mv "${pkgdir}/${pytorchpath}/share/cmake"/* \
+ "${pkgdir}/usr/lib/cmake/"
+
+ # put C++ API in correct place
+ install -d "${pkgdir}/usr/include"
+ install -d "${pkgdir}/usr/lib/pytorch"
+ mv "${pkgdir}/${pytorchpath}/include"/* "${pkgdir}/usr/include/"
+ mv "${pkgdir}/${pytorchpath}/lib"/*.so* "${pkgdir}/usr/lib/pytorch/"
+
+ # clean up duplicates
+ # TODO: move towards direct shared library dependecy of:
+ # c10, caffe2, libcpuinfo, CUDA RT, gloo, GTest, Intel MKL,
+ # NVRTC, ONNX, protobuf, libthreadpool, QNNPACK
+ rm -rf "${pkgdir}/${pytorchpath}/share/cmake"
+ rm -rf "${pkgdir}/${pytorchpath}/include"
+ rm -rf "${pkgdir}/usr/include/pybind11"
+
+ # python module is hardcoded to look there at runtime
+ ln -s /usr/include "${pkgdir}/${pytorchpath}/include"
+ find "${pkgdir}"/usr/lib/pytorch -type f -name "*.so*" -print0 | while read -rd $'\0' _lib; do
+ ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/"
+ done
+
+ # ldconfig
+ install -d "${pkgdir}/etc/ld.so.conf.d"
+ echo '/usr/lib/pytorch' > "${pkgdir}/etc/ld.so.conf.d/pytorch.conf"
+}
+
+package_python-pytorch() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ _package
+}
+
+package_python-pytorch-opt() {
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt"
+ _package
+}
+
+package_python-pytorch-cuda() {
+ depends+=('cuda' 'cudnn')
+ provides=('python-pytorch')
+ conflicts=('python-pytorch')
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
+ _package
+}
+
+package_python-pytorch-opt-cuda() {
+ depends+=('cuda' 'cudnn')
+ provides=('python-pytorch')
+ conflicts=('python-pytorch')
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt-cuda"
+ _package
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: change_default_config.patch
===================================================================
--- change_default_config.patch 2019-06-12 08:16:49 UTC (rev 480628)
+++ change_default_config.patch 2019-06-12 08:17:02 UTC (rev 480629)
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71f8b693a..07e564919 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,10 +67,10 @@ option(BUILD_ATEN_MOBILE "Build ATen for Android and iOS" OFF)
- option(BUILD_ATEN_ONLY "Build only a subset focused on ATen only" OFF)
- option(BUILD_BINARY "Build C++ binaries" OFF)
- option(BUILD_DOCS "Build Caffe2 documentation" OFF)
--option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" ON)
-+option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" OFF)
- option(BUILD_PYTHON "Build Python binaries" ON)
- option(BUILD_CAFFE2_OPS "Build Caffe2 operators" ON)
--option(BUILD_SHARED_LIBS "Build libcaffe2.so" ON)
-+option(BUILD_SHARED_LIBS "Build libcaffe2.so" OFF)
- cmake_dependent_option(
- CAFFE2_LINK_LOCAL_PROTOBUF "If set, build protobuf inside libcaffe2.so." ON
- "BUILD_SHARED_LIBS AND BUILD_CUSTOM_PROTOBUF" OFF)
-@@ -90,8 +90,8 @@ cmake_dependent_option(
- "USE_CUDA" OFF)
- option(USE_FBGEMM "Use FBGEMM (quantized 8-bit server operators)" OFF)
- option(USE_FFMPEG "Use ffmpeg" OFF)
--option(USE_GFLAGS "Use GFLAGS" OFF)
--option(USE_GLOG "Use GLOG" OFF)
-+option(USE_GFLAGS "Use GFLAGS" ON)
-+option(USE_GLOG "Use GLOG" ON)
- option(USE_LEVELDB "Use LEVELDB" OFF)
- option(USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
- option(USE_LMDB "Use LMDB" OFF)
Copied: python-pytorch/repos/community-x86_64/change_default_config.patch (from rev 480628, python-pytorch/trunk/change_default_config.patch)
===================================================================
--- change_default_config.patch (rev 0)
+++ change_default_config.patch 2019-06-12 08:17:02 UTC (rev 480629)
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 71f8b693a..07e564919 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,10 +67,10 @@ option(BUILD_ATEN_MOBILE "Build ATen for Android and iOS" OFF)
+ option(BUILD_ATEN_ONLY "Build only a subset focused on ATen only" OFF)
+ option(BUILD_BINARY "Build C++ binaries" OFF)
+ option(BUILD_DOCS "Build Caffe2 documentation" OFF)
+-option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" ON)
++option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" OFF)
+ option(BUILD_PYTHON "Build Python binaries" ON)
+ option(BUILD_CAFFE2_OPS "Build Caffe2 operators" ON)
+-option(BUILD_SHARED_LIBS "Build libcaffe2.so" ON)
++option(BUILD_SHARED_LIBS "Build libcaffe2.so" OFF)
+ cmake_dependent_option(
+ CAFFE2_LINK_LOCAL_PROTOBUF "If set, build protobuf inside libcaffe2.so." ON
+ "BUILD_SHARED_LIBS AND BUILD_CUSTOM_PROTOBUF" OFF)
+@@ -90,8 +90,8 @@ cmake_dependent_option(
+ "USE_CUDA" OFF)
+ option(USE_FBGEMM "Use FBGEMM (quantized 8-bit server operators)" OFF)
+ option(USE_FFMPEG "Use ffmpeg" OFF)
+-option(USE_GFLAGS "Use GFLAGS" OFF)
+-option(USE_GLOG "Use GLOG" OFF)
++option(USE_GFLAGS "Use GFLAGS" ON)
++option(USE_GLOG "Use GLOG" ON)
+ option(USE_LEVELDB "Use LEVELDB" OFF)
+ option(USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
+ option(USE_LMDB "Use LMDB" OFF)
More information about the arch-commits
mailing list