[arch-commits] Commit in python-pytorch/repos/community-x86_64 (18 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Wed Sep 29 23:02:05 UTC 2021
Date: Wednesday, September 29, 2021 @ 23:02:04
Author: svenstaro
Revision: 1026013
archrelease: copy trunk to community-x86_64
Added:
python-pytorch/repos/community-x86_64/PKGBUILD
(from rev 1026012, python-pytorch/trunk/PKGBUILD)
python-pytorch/repos/community-x86_64/benchmark-gcc11.patch
(from rev 1026012, python-pytorch/trunk/benchmark-gcc11.patch)
python-pytorch/repos/community-x86_64/disable_non_x86_64.patch
(from rev 1026012, python-pytorch/trunk/disable_non_x86_64.patch)
python-pytorch/repos/community-x86_64/fix-building-for-torchvision.patch
(from rev 1026012, python-pytorch/trunk/fix-building-for-torchvision.patch)
python-pytorch/repos/community-x86_64/fix_c10.patch
(from rev 1026012, python-pytorch/trunk/fix_c10.patch)
python-pytorch/repos/community-x86_64/fix_include_system.patch
(from rev 1026012, python-pytorch/trunk/fix_include_system.patch)
python-pytorch/repos/community-x86_64/test.py
(from rev 1026012, python-pytorch/trunk/test.py)
python-pytorch/repos/community-x86_64/use-system-libuv.patch
(from rev 1026012, python-pytorch/trunk/use-system-libuv.patch)
python-pytorch/repos/community-x86_64/xnnpack-gcc11.patch
(from rev 1026012, python-pytorch/trunk/xnnpack-gcc11.patch)
Deleted:
python-pytorch/repos/community-x86_64/PKGBUILD
python-pytorch/repos/community-x86_64/benchmark-gcc11.patch
python-pytorch/repos/community-x86_64/disable_non_x86_64.patch
python-pytorch/repos/community-x86_64/fix-building-for-torchvision.patch
python-pytorch/repos/community-x86_64/fix_c10.patch
python-pytorch/repos/community-x86_64/fix_include_system.patch
python-pytorch/repos/community-x86_64/test.py
python-pytorch/repos/community-x86_64/use-system-libuv.patch
python-pytorch/repos/community-x86_64/xnnpack-gcc11.patch
------------------------------------+
PKGBUILD | 626 +++++++++++++++++------------------
benchmark-gcc11.patch | 60 +--
disable_non_x86_64.patch | 30 -
fix-building-for-torchvision.patch | 50 +-
fix_c10.patch | 24 -
fix_include_system.patch | 26 -
test.py | 14
use-system-libuv.patch | 26 -
xnnpack-gcc11.patch | 66 +--
9 files changed, 461 insertions(+), 461 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-09-29 23:00:56 UTC (rev 1026012)
+++ PKGBUILD 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,313 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.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.9.0
-_pkgver=1.9.0
-pkgrel=7
-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' 'libuv'
- 'python-numpy' 'protobuf' 'ffmpeg' 'python-future' 'qt5-base' 'onednn' 'intel-mkl'
- 'python-typing_extensions')
-makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda'
- 'cudnn' 'git' 'magma' 'ninja' 'pkgconfig' 'doxygen')
-source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver"
- # generated using parse-submodules
- "${pkgname}-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git"
- "${pkgname}-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git"
- "${pkgname}-FP16::git+https://github.com/Maratyszcza/FP16.git"
- "${pkgname}-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git"
- "${pkgname}-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git"
- "${pkgname}-PeachPy::git+https://github.com/Maratyszcza/PeachPy.git"
- "${pkgname}-cub::git+https://github.com/NVlabs/cub.git"
- "${pkgname}-psimd::git+https://github.com/Maratyszcza/psimd.git"
- "${pkgname}-cpuinfo::git+https://github.com/pytorch/cpuinfo.git"
- "${pkgname}-enum34::git+https://github.com/PeachPy/enum34.git"
- "${pkgname}-ideep::git+https://github.com/intel/ideep"
- "${pkgname}-QNNPACK::git+https://github.com/pytorch/QNNPACK"
- "${pkgname}-foxi::git+https://github.com/houseroad/foxi.git"
- "${pkgname}-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git"
- "${pkgname}-six::git+https://github.com/benjaminp/six.git"
- "${pkgname}-eigen-git-mirror::git+https://github.com/eigenteam/eigen-git-mirror.git"
- "${pkgname}-gloo::git+https://github.com/facebookincubator/gloo"
- "${pkgname}-nccl::git+https://github.com/NVIDIA/nccl"
- "${pkgname}-gemmlowp::git+https://github.com/google/gemmlowp.git"
- "${pkgname}-kineto::git+https://github.com/pytorch/kineto"
- "${pkgname}-sleef::git+https://github.com/shibatch/sleef"
- "${pkgname}-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt"
- "${pkgname}-benchmark::git+https://github.com/google/benchmark.git"
- "${pkgname}-tbb::git+https://github.com/01org/tbb"
- "${pkgname}-XNNPACK::git+https://github.com/malfet/XNNPACK.git"
- "${pkgname}-fbjni::git+https://github.com/facebookincubator/fbjni.git"
- "${pkgname}-tensorpipe::git+https://github.com/pytorch/tensorpipe.git"
- "${pkgname}-pybind11::git+https://github.com/pybind/pybind11.git"
- "${pkgname}-fbgemm::git+https://github.com/pytorch/fbgemm"
- "${pkgname}-googletest::git+https://github.com/google/googletest.git"
- "${pkgname}-zstd::git+https://github.com/facebook/zstd.git"
- "${pkgname}-onnx::git+https://github.com/onnx/onnx.git"
- "${pkgname}-protobuf::git+https://github.com/protocolbuffers/protobuf.git"
- "${pkgname}-fmt::git+https://github.com/fmtlib/fmt.git"
- fix_include_system.patch
- use-system-libuv.patch
- fix-building-for-torchvision.patch
- benchmark-gcc11.patch
- xnnpack-gcc11.patch
- https://github.com/pytorch/pytorch/commit/c74c0c571880df886474be297c556562e95c00e0.patch
- fix_c10.patch
- disable_non_x86_64.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'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '557761502bbd994d9795bef46779e4b8c60ba0b45e7d60841f477d3b7f28a00a'
- 'cd9ac4aaa9f946ac5eafc57cf66c5c16b3ea7ac8af32c2558fad0705411bb669'
- '689c76e89bcf403df1b4cf7ca784381967b6a6527ed6eb6d0ad6681cf789b738'
- '278fecdb45df065343f51688cc7a1665153b5189f3341a741d546b0b518eac40'
- '64833e96e47a22f88336381f25fcd73127208dc79e2074398295d88c4596c06a'
- 'b106af479ef78803b39868fa1458c22c6e7fdbd13a15ebca20893e1c81c75463'
- 'ba801238afcfc58a35410e54d4ca6a638c447865c0c6b38ed16917fd6d507954'
- 'd3ef8491718ed7e814fe63e81df2f49862fffbea891d2babbcb464796a1bd680')
-
-prepare() {
- cd "${_pkgname}-${pkgver}"
-
- # generated using parse-submodules
- git submodule init
-
- git config submodule."third_party/pybind11".url "${srcdir}/${pkgname}"-pybind11
- git config submodule."third_party/cub".url "${srcdir}/${pkgname}"-cub
- git config submodule."third_party/eigen".url "${srcdir}/${pkgname}"-eigen-git-mirror
- git config submodule."third_party/googletest".url "${srcdir}/${pkgname}"-googletest
- git config submodule."third_party/benchmark".url "${srcdir}/${pkgname}"-benchmark
- git config submodule."third_party/protobuf".url "${srcdir}/${pkgname}"-protobuf
- git config submodule."third_party/ios-cmake".url "${srcdir}/${pkgname}"-ios-cmake
- git config submodule."third_party/NNPACK".url "${srcdir}/${pkgname}"-NNPACK
- git config submodule."third_party/gloo".url "${srcdir}/${pkgname}"-gloo
- git config submodule."third_party/NNPACK_deps/pthreadpool".url "${srcdir}/${pkgname}"-pthreadpool
- git config submodule."third_party/NNPACK_deps/FXdiv".url "${srcdir}/${pkgname}"-FXdiv
- git config submodule."third_party/NNPACK_deps/FP16".url "${srcdir}/${pkgname}"-FP16
- git config submodule."third_party/NNPACK_deps/psimd".url "${srcdir}/${pkgname}"-psimd
- git config submodule."third_party/zstd".url "${srcdir}/${pkgname}"-zstd
- git config submodule."third-party/cpuinfo".url "${srcdir}/${pkgname}"-cpuinfo
- git config submodule."third_party/python-enum".url "${srcdir}/${pkgname}"-enum34
- git config submodule."third_party/python-peachpy".url "${srcdir}/${pkgname}"-PeachPy
- git config submodule."third_party/python-six".url "${srcdir}/${pkgname}"-six
- git config submodule."third_party/onnx".url "${srcdir}/${pkgname}"-onnx
- git config submodule."third_party/onnx-tensorrt".url "${srcdir}/${pkgname}"-onnx-tensorrt
- git config submodule."third_party/sleef".url "${srcdir}/${pkgname}"-sleef
- git config submodule."third_party/ideep".url "${srcdir}/${pkgname}"-ideep
- git config submodule."third_party/nccl/nccl".url "${srcdir}/${pkgname}"-nccl
- git config submodule."third_party/gemmlowp/gemmlowp".url "${srcdir}/${pkgname}"-gemmlowp
- git config submodule."third_party/QNNPACK".url "${srcdir}/${pkgname}"-QNNPACK
- git config submodule."third_party/neon2sse".url "${srcdir}/${pkgname}"-ARM_NEON_2_x86_SSE
- git config submodule."third_party/fbgemm".url "${srcdir}/${pkgname}"-fbgemm
- git config submodule."third_party/foxi".url "${srcdir}/${pkgname}"-foxi
- git config submodule."third_party/tbb".url "${srcdir}/${pkgname}"-tbb
- git config submodule."android/libs/fbjni".url "${srcdir}/${pkgname}"-fbjni
- git config submodule."third_party/XNNPACK".url "${srcdir}/${pkgname}"-XNNPACK
- git config submodule."third_party/fmt".url "${srcdir}/${pkgname}"-fmt
- git config submodule."third_party/tensorpipe".url "${srcdir}/${pkgname}"-tensorpipe
- git config submodule."third_party/kineto".url "${srcdir}/${pkgname}"-kineto
-
- git submodule update --init --recursive
-
- # https://bugs.archlinux.org/task/64981
- patch -N torch/utils/cpp_extension.py "${srcdir}"/fix_include_system.patch
-
- # Use system libuv
- patch -Np1 -i "${srcdir}"/use-system-libuv.patch
-
- # fix https://github.com/pytorch/vision/issues/3695
- patch -Np1 -i "${srcdir}/fix-building-for-torchvision.patch"
-
- # GCC 11 fixes
- patch -Np1 -d third_party/benchmark <../benchmark-gcc11.patch
- patch -Np1 -d third_party/XNNPACK <../xnnpack-gcc11.patch
-
- # cuda 11.4 fix
- patch -Np1 <../c74c0c571880df886474be297c556562e95c00e0.patch
- # cuda 11.4.1 fix
- patch -Np1 -i "${srcdir}/fix_c10.patch"
-
- # remove local nccl
- rm -rf third_party/nccl/nccl
- # also remove path from nccl module, so it's not checked
- sed -e '/path = third_party\/nccl\/nccl/d' -i ./.gitmodules
-
- # fix build with google-glog 0.5 https://github.com/pytorch/pytorch/issues/58054
- sed -e '/namespace glog_internal_namespace_/d' -e 's|::glog_internal_namespace_||' -i c10/util/Logging.cpp
-
- cd ..
-
- cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt"
- cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-cuda"
- cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt-cuda"
-
- export VERBOSE=1
- export PYTORCH_BUILD_VERSION="${pkgver}"
- export PYTORCH_BUILD_NUMBER=1
-
- # Check tools/setup_helpers/cmake.py, setup.py and CMakeLists.txt for a list of flags that can be set via env vars.
- export ATEN_NO_TEST=ON # do not build ATen tests
- export USE_MKLDNN=ON
- export BUILD_CUSTOM_PROTOBUF=OFF
- # export BUILD_SHARED_LIBS=OFF
- export USE_FFMPEG=ON
- export USE_GFLAGS=ON
- export USE_GLOG=ON
- export BUILD_BINARY=ON
- export USE_OPENCV=ON
- # export USE_SYSTEM_LIBS=ON # experimental, not all libs present in repos
- export USE_SYSTEM_NCCL=ON
- export NCCL_VERSION=$(pkg-config nccl --modversion)
- export NCCL_VER_CODE=$(sed -n 's/^#define NCCL_VERSION_CODE\s*\(.*\).*/\1/p' /usr/include/nccl.h)
- # export BUILD_SPLIT_CUDA=ON # modern preferred build, but splits libs and symbols, ABI break
- # export USE_FAST_NVCC=ON # parallel build with nvcc, spawns too many processes
- export USE_CUPTI_SO=ON # make sure cupti.so is used as shared lib
- export CUDAHOSTCXX=/usr/bin/g++
- export CUDA_HOST_COMPILER="${CUDAHOSTCXX}"
- 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="5.2;6.0;6.2;7.0;7.2;7.5;8.0;8.6;8.6+PTX" #include latest PTX for future compat
- export OVERRIDE_TORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST}"
-}
-
-build() {
- echo "Building without cuda and without non-x86-64 optimizations"
- export USE_CUDA=0
- export USE_CUDNN=0
- cd "${srcdir}/${_pkgname}-${pkgver}"
- echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake
- patch -Np1 -i "${srcdir}/disable_non_x86_64.patch"
- python setup.py build
-
-
- echo "Building without cuda and with non-x86-64 optimizations"
- export USE_CUDA=0
- export USE_CUDNN=0
- cd "${srcdir}/${_pkgname}-${pkgver}-opt"
- echo "add_definitions(-march=haswell)" >> cmake/MiscCheck.cmake
- python setup.py build
-
-
- echo "Building with cuda and without non-x86-64 optimizations"
- export USE_CUDA=1
- export USE_CUDNN=1
- cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
- patch -Np1 -i "${srcdir}/disable_non_x86_64.patch"
- echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake
- python setup.py build
-
-
- echo "Building with cuda and with non-x86-64 optimizations"
- export USE_CUDA=1
- export USE_CUDNN=1
- cd "${srcdir}/${_pkgname}-${pkgver}-opt-cuda"
- echo "add_definitions(-march=haswell)" >> 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"
-
- pytorchpath="usr/lib/python3.9/site-packages/torch"
- install -d "${pkgdir}/usr/lib"
-
- # put CMake files in correct place
- mv "${pkgdir}/${pytorchpath}/share/cmake" "${pkgdir}/usr/lib/cmake"
-
- # put C++ API in correct place
- mv "${pkgdir}/${pytorchpath}/include" "${pkgdir}/usr/include"
- mv "${pkgdir}/${pytorchpath}/lib"/*.so* "${pkgdir}/usr/lib/"
-
- # 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}/usr/include/pybind11"
-
- # python module is hardcoded to look there at runtime
- ln -s /usr/include "${pkgdir}/${pytorchpath}/include"
- find "${pkgdir}"/usr/lib -type f -name "*.so*" -print0 | while read -rd $'\0' _lib; do
- ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/"
- done
-}
-
-package_python-pytorch() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- _package
-}
-
-package_python-pytorch-opt() {
- pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration (with AVX2 CPU optimizations)"
- conflicts=(python-pytorch)
- provides=(python-pytorch)
-
- cd "${srcdir}/${_pkgname}-${pkgver}-opt"
- _package
-}
-
-package_python-pytorch-cuda() {
- pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration (with CUDA)"
- depends+=(cuda cudnn magma)
- conflicts=(python-pytorch)
- provides=(python-pytorch)
-
- cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
- _package
-}
-
-package_python-pytorch-opt-cuda() {
- pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration (with CUDA and AVX2 CPU optimizations)"
- depends+=(cuda cudnn magma)
- conflicts=(python-pytorch)
- provides=(python-pytorch python-pytorch-cuda)
-
- cd "${srcdir}/${_pkgname}-${pkgver}-opt-cuda"
- _package
-}
-
-# vim:set ts=2 sw=2 et:
Copied: python-pytorch/repos/community-x86_64/PKGBUILD (from rev 1026012, python-pytorch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,313 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.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.9.1
+_pkgver=1.9.1
+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' 'libuv'
+ 'python-numpy' 'protobuf' 'ffmpeg' 'python-future' 'qt5-base' 'onednn' 'intel-mkl'
+ 'python-typing_extensions')
+makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda'
+ 'cudnn' 'git' 'magma' 'ninja' 'pkgconfig' 'doxygen')
+source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver"
+ # generated using parse-submodules
+ "${pkgname}-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git"
+ "${pkgname}-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git"
+ "${pkgname}-FP16::git+https://github.com/Maratyszcza/FP16.git"
+ "${pkgname}-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git"
+ "${pkgname}-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git"
+ "${pkgname}-PeachPy::git+https://github.com/Maratyszcza/PeachPy.git"
+ "${pkgname}-cub::git+https://github.com/NVlabs/cub.git"
+ "${pkgname}-psimd::git+https://github.com/Maratyszcza/psimd.git"
+ "${pkgname}-cpuinfo::git+https://github.com/pytorch/cpuinfo.git"
+ "${pkgname}-enum34::git+https://github.com/PeachPy/enum34.git"
+ "${pkgname}-ideep::git+https://github.com/intel/ideep"
+ "${pkgname}-QNNPACK::git+https://github.com/pytorch/QNNPACK"
+ "${pkgname}-foxi::git+https://github.com/houseroad/foxi.git"
+ "${pkgname}-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git"
+ "${pkgname}-six::git+https://github.com/benjaminp/six.git"
+ "${pkgname}-eigen-git-mirror::git+https://github.com/eigenteam/eigen-git-mirror.git"
+ "${pkgname}-gloo::git+https://github.com/facebookincubator/gloo"
+ "${pkgname}-nccl::git+https://github.com/NVIDIA/nccl"
+ "${pkgname}-gemmlowp::git+https://github.com/google/gemmlowp.git"
+ "${pkgname}-kineto::git+https://github.com/pytorch/kineto"
+ "${pkgname}-sleef::git+https://github.com/shibatch/sleef"
+ "${pkgname}-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt"
+ "${pkgname}-benchmark::git+https://github.com/google/benchmark.git"
+ "${pkgname}-tbb::git+https://github.com/01org/tbb"
+ "${pkgname}-XNNPACK::git+https://github.com/malfet/XNNPACK.git"
+ "${pkgname}-fbjni::git+https://github.com/facebookincubator/fbjni.git"
+ "${pkgname}-tensorpipe::git+https://github.com/pytorch/tensorpipe.git"
+ "${pkgname}-pybind11::git+https://github.com/pybind/pybind11.git"
+ "${pkgname}-fbgemm::git+https://github.com/pytorch/fbgemm"
+ "${pkgname}-googletest::git+https://github.com/google/googletest.git"
+ "${pkgname}-zstd::git+https://github.com/facebook/zstd.git"
+ "${pkgname}-onnx::git+https://github.com/onnx/onnx.git"
+ "${pkgname}-protobuf::git+https://github.com/protocolbuffers/protobuf.git"
+ "${pkgname}-fmt::git+https://github.com/fmtlib/fmt.git"
+ fix_include_system.patch
+ use-system-libuv.patch
+ fix-building-for-torchvision.patch
+ benchmark-gcc11.patch
+ xnnpack-gcc11.patch
+ https://github.com/pytorch/pytorch/commit/c74c0c571880df886474be297c556562e95c00e0.patch
+ fix_c10.patch
+ disable_non_x86_64.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'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '557761502bbd994d9795bef46779e4b8c60ba0b45e7d60841f477d3b7f28a00a'
+ 'cd9ac4aaa9f946ac5eafc57cf66c5c16b3ea7ac8af32c2558fad0705411bb669'
+ '689c76e89bcf403df1b4cf7ca784381967b6a6527ed6eb6d0ad6681cf789b738'
+ '278fecdb45df065343f51688cc7a1665153b5189f3341a741d546b0b518eac40'
+ '64833e96e47a22f88336381f25fcd73127208dc79e2074398295d88c4596c06a'
+ '4c87cce784747767396dcb3f70b519d163544645f0d136b32ed671ae1e646d74'
+ 'ba801238afcfc58a35410e54d4ca6a638c447865c0c6b38ed16917fd6d507954'
+ 'd3ef8491718ed7e814fe63e81df2f49862fffbea891d2babbcb464796a1bd680')
+
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+
+ # generated using parse-submodules
+ git submodule init
+
+ git config submodule."third_party/pybind11".url "${srcdir}/${pkgname}"-pybind11
+ git config submodule."third_party/cub".url "${srcdir}/${pkgname}"-cub
+ git config submodule."third_party/eigen".url "${srcdir}/${pkgname}"-eigen-git-mirror
+ git config submodule."third_party/googletest".url "${srcdir}/${pkgname}"-googletest
+ git config submodule."third_party/benchmark".url "${srcdir}/${pkgname}"-benchmark
+ git config submodule."third_party/protobuf".url "${srcdir}/${pkgname}"-protobuf
+ git config submodule."third_party/ios-cmake".url "${srcdir}/${pkgname}"-ios-cmake
+ git config submodule."third_party/NNPACK".url "${srcdir}/${pkgname}"-NNPACK
+ git config submodule."third_party/gloo".url "${srcdir}/${pkgname}"-gloo
+ git config submodule."third_party/NNPACK_deps/pthreadpool".url "${srcdir}/${pkgname}"-pthreadpool
+ git config submodule."third_party/NNPACK_deps/FXdiv".url "${srcdir}/${pkgname}"-FXdiv
+ git config submodule."third_party/NNPACK_deps/FP16".url "${srcdir}/${pkgname}"-FP16
+ git config submodule."third_party/NNPACK_deps/psimd".url "${srcdir}/${pkgname}"-psimd
+ git config submodule."third_party/zstd".url "${srcdir}/${pkgname}"-zstd
+ git config submodule."third-party/cpuinfo".url "${srcdir}/${pkgname}"-cpuinfo
+ git config submodule."third_party/python-enum".url "${srcdir}/${pkgname}"-enum34
+ git config submodule."third_party/python-peachpy".url "${srcdir}/${pkgname}"-PeachPy
+ git config submodule."third_party/python-six".url "${srcdir}/${pkgname}"-six
+ git config submodule."third_party/onnx".url "${srcdir}/${pkgname}"-onnx
+ git config submodule."third_party/onnx-tensorrt".url "${srcdir}/${pkgname}"-onnx-tensorrt
+ git config submodule."third_party/sleef".url "${srcdir}/${pkgname}"-sleef
+ git config submodule."third_party/ideep".url "${srcdir}/${pkgname}"-ideep
+ git config submodule."third_party/nccl/nccl".url "${srcdir}/${pkgname}"-nccl
+ git config submodule."third_party/gemmlowp/gemmlowp".url "${srcdir}/${pkgname}"-gemmlowp
+ git config submodule."third_party/QNNPACK".url "${srcdir}/${pkgname}"-QNNPACK
+ git config submodule."third_party/neon2sse".url "${srcdir}/${pkgname}"-ARM_NEON_2_x86_SSE
+ git config submodule."third_party/fbgemm".url "${srcdir}/${pkgname}"-fbgemm
+ git config submodule."third_party/foxi".url "${srcdir}/${pkgname}"-foxi
+ git config submodule."third_party/tbb".url "${srcdir}/${pkgname}"-tbb
+ git config submodule."android/libs/fbjni".url "${srcdir}/${pkgname}"-fbjni
+ git config submodule."third_party/XNNPACK".url "${srcdir}/${pkgname}"-XNNPACK
+ git config submodule."third_party/fmt".url "${srcdir}/${pkgname}"-fmt
+ git config submodule."third_party/tensorpipe".url "${srcdir}/${pkgname}"-tensorpipe
+ git config submodule."third_party/kineto".url "${srcdir}/${pkgname}"-kineto
+
+ git submodule update --init --recursive
+
+ # https://bugs.archlinux.org/task/64981
+ patch -N torch/utils/cpp_extension.py "${srcdir}"/fix_include_system.patch
+
+ # Use system libuv
+ patch -Np1 -i "${srcdir}"/use-system-libuv.patch
+
+ # fix https://github.com/pytorch/vision/issues/3695
+ patch -Np1 -i "${srcdir}/fix-building-for-torchvision.patch"
+
+ # GCC 11 fixes
+ patch -Np1 -d third_party/benchmark <../benchmark-gcc11.patch
+ patch -Np1 -d third_party/XNNPACK <../xnnpack-gcc11.patch
+
+ # cuda 11.4 fix
+ patch -Np1 <../c74c0c571880df886474be297c556562e95c00e0.patch
+ # cuda 11.4.1 fix
+ patch -Np1 -i "${srcdir}/fix_c10.patch"
+
+ # remove local nccl
+ rm -rf third_party/nccl/nccl
+ # also remove path from nccl module, so it's not checked
+ sed -e '/path = third_party\/nccl\/nccl/d' -i ./.gitmodules
+
+ # fix build with google-glog 0.5 https://github.com/pytorch/pytorch/issues/58054
+ sed -e '/namespace glog_internal_namespace_/d' -e 's|::glog_internal_namespace_||' -i c10/util/Logging.cpp
+
+ cd ..
+
+ cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt"
+ cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-cuda"
+ cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt-cuda"
+
+ export VERBOSE=1
+ export PYTORCH_BUILD_VERSION="${pkgver}"
+ export PYTORCH_BUILD_NUMBER=1
+
+ # Check tools/setup_helpers/cmake.py, setup.py and CMakeLists.txt for a list of flags that can be set via env vars.
+ export ATEN_NO_TEST=ON # do not build ATen tests
+ export USE_MKLDNN=ON
+ export BUILD_CUSTOM_PROTOBUF=OFF
+ # export BUILD_SHARED_LIBS=OFF
+ export USE_FFMPEG=ON
+ export USE_GFLAGS=ON
+ export USE_GLOG=ON
+ export BUILD_BINARY=ON
+ export USE_OPENCV=ON
+ # export USE_SYSTEM_LIBS=ON # experimental, not all libs present in repos
+ export USE_SYSTEM_NCCL=ON
+ export NCCL_VERSION=$(pkg-config nccl --modversion)
+ export NCCL_VER_CODE=$(sed -n 's/^#define NCCL_VERSION_CODE\s*\(.*\).*/\1/p' /usr/include/nccl.h)
+ # export BUILD_SPLIT_CUDA=ON # modern preferred build, but splits libs and symbols, ABI break
+ # export USE_FAST_NVCC=ON # parallel build with nvcc, spawns too many processes
+ export USE_CUPTI_SO=ON # make sure cupti.so is used as shared lib
+ export CUDAHOSTCXX=/usr/bin/g++
+ export CUDA_HOST_COMPILER="${CUDAHOSTCXX}"
+ 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="5.2;6.0;6.2;7.0;7.2;7.5;8.0;8.6;8.6+PTX" #include latest PTX for future compat
+ export OVERRIDE_TORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST}"
+}
+
+build() {
+ echo "Building without cuda and without non-x86-64 optimizations"
+ export USE_CUDA=0
+ export USE_CUDNN=0
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake
+ patch -Np1 -i "${srcdir}/disable_non_x86_64.patch"
+ python setup.py build
+
+
+ echo "Building without cuda and with non-x86-64 optimizations"
+ export USE_CUDA=0
+ export USE_CUDNN=0
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt"
+ echo "add_definitions(-march=haswell)" >> cmake/MiscCheck.cmake
+ python setup.py build
+
+
+ echo "Building with cuda and without non-x86-64 optimizations"
+ export USE_CUDA=1
+ export USE_CUDNN=1
+ cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
+ patch -Np1 -i "${srcdir}/disable_non_x86_64.patch"
+ echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake
+ python setup.py build
+
+
+ echo "Building with cuda and with non-x86-64 optimizations"
+ export USE_CUDA=1
+ export USE_CUDNN=1
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt-cuda"
+ echo "add_definitions(-march=haswell)" >> 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"
+
+ pytorchpath="usr/lib/python3.9/site-packages/torch"
+ install -d "${pkgdir}/usr/lib"
+
+ # put CMake files in correct place
+ mv "${pkgdir}/${pytorchpath}/share/cmake" "${pkgdir}/usr/lib/cmake"
+
+ # put C++ API in correct place
+ mv "${pkgdir}/${pytorchpath}/include" "${pkgdir}/usr/include"
+ mv "${pkgdir}/${pytorchpath}/lib"/*.so* "${pkgdir}/usr/lib/"
+
+ # 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}/usr/include/pybind11"
+
+ # python module is hardcoded to look there at runtime
+ ln -s /usr/include "${pkgdir}/${pytorchpath}/include"
+ find "${pkgdir}"/usr/lib -type f -name "*.so*" -print0 | while read -rd $'\0' _lib; do
+ ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/"
+ done
+}
+
+package_python-pytorch() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ _package
+}
+
+package_python-pytorch-opt() {
+ pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration (with AVX2 CPU optimizations)"
+ conflicts=(python-pytorch)
+ provides=(python-pytorch)
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt"
+ _package
+}
+
+package_python-pytorch-cuda() {
+ pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration (with CUDA)"
+ depends+=(cuda cudnn magma)
+ conflicts=(python-pytorch)
+ provides=(python-pytorch)
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-cuda"
+ _package
+}
+
+package_python-pytorch-opt-cuda() {
+ pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration (with CUDA and AVX2 CPU optimizations)"
+ depends+=(cuda cudnn magma)
+ conflicts=(python-pytorch)
+ provides=(python-pytorch python-pytorch-cuda)
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt-cuda"
+ _package
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: benchmark-gcc11.patch
===================================================================
--- benchmark-gcc11.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ benchmark-gcc11.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,30 +0,0 @@
-From 3d1c2677686718d906f28c1d4da001c42666e6d2 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox at inbox.ru>
-Date: Thu, 15 Oct 2020 09:12:40 +0100
-Subject: [PATCH] src/benchmark_register.h: add missing <limits> inclusion
- (#1060)
-
-Noticed missing header when was building llvm with gcc-11:
-
-```
-llvm-project/llvm/utils/benchmark/src/benchmark_register.h:17:30:
- error: 'numeric_limits' is not a member of 'std'
- 17 | static const T kmax = std::numeric_limits<T>::max();
- | ^~~~~~~~~~~~~~
-```
----
- src/benchmark_register.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/benchmark_register.h b/src/benchmark_register.h
-index 61377d742..204bf1d9f 100644
---- a/src/benchmark_register.h
-+++ b/src/benchmark_register.h
-@@ -1,6 +1,7 @@
- #ifndef BENCHMARK_REGISTER_H
- #define BENCHMARK_REGISTER_H
-
-+#include <limits>
- #include <vector>
-
- #include "check.h"
Copied: python-pytorch/repos/community-x86_64/benchmark-gcc11.patch (from rev 1026012, python-pytorch/trunk/benchmark-gcc11.patch)
===================================================================
--- benchmark-gcc11.patch (rev 0)
+++ benchmark-gcc11.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,30 @@
+From 3d1c2677686718d906f28c1d4da001c42666e6d2 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox at inbox.ru>
+Date: Thu, 15 Oct 2020 09:12:40 +0100
+Subject: [PATCH] src/benchmark_register.h: add missing <limits> inclusion
+ (#1060)
+
+Noticed missing header when was building llvm with gcc-11:
+
+```
+llvm-project/llvm/utils/benchmark/src/benchmark_register.h:17:30:
+ error: 'numeric_limits' is not a member of 'std'
+ 17 | static const T kmax = std::numeric_limits<T>::max();
+ | ^~~~~~~~~~~~~~
+```
+---
+ src/benchmark_register.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/benchmark_register.h b/src/benchmark_register.h
+index 61377d742..204bf1d9f 100644
+--- a/src/benchmark_register.h
++++ b/src/benchmark_register.h
+@@ -1,6 +1,7 @@
+ #ifndef BENCHMARK_REGISTER_H
+ #define BENCHMARK_REGISTER_H
+
++#include <limits>
+ #include <vector>
+
+ #include "check.h"
Deleted: disable_non_x86_64.patch
===================================================================
--- disable_non_x86_64.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ disable_non_x86_64.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,15 +0,0 @@
-diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
-index d5db749d15..fd54cca6b8 100644
---- a/tools/setup_helpers/cmake.py
-+++ b/tools/setup_helpers/cmake.py
-@@ -295,6 +295,10 @@ class CMake:
- build_options.update(cmake__options)
-
- CMake.defines(args,
-+ DISABLE_AVX2=1,
-+ DISABLE_AVX512F=1,
-+ DISABLE_FMA4=1,
-+ DISABLE_SSE4=1,
- PYTHON_EXECUTABLE=sys.executable,
- PYTHON_LIBRARY=cmake_python_library,
- PYTHON_INCLUDE_DIR=distutils.sysconfig.get_python_inc(),
Copied: python-pytorch/repos/community-x86_64/disable_non_x86_64.patch (from rev 1026012, python-pytorch/trunk/disable_non_x86_64.patch)
===================================================================
--- disable_non_x86_64.patch (rev 0)
+++ disable_non_x86_64.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,15 @@
+diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
+index d5db749d15..fd54cca6b8 100644
+--- a/tools/setup_helpers/cmake.py
++++ b/tools/setup_helpers/cmake.py
+@@ -295,6 +295,10 @@ class CMake:
+ build_options.update(cmake__options)
+
+ CMake.defines(args,
++ DISABLE_AVX2=1,
++ DISABLE_AVX512F=1,
++ DISABLE_FMA4=1,
++ DISABLE_SSE4=1,
+ PYTHON_EXECUTABLE=sys.executable,
+ PYTHON_LIBRARY=cmake_python_library,
+ PYTHON_INCLUDE_DIR=distutils.sysconfig.get_python_inc(),
Deleted: fix-building-for-torchvision.patch
===================================================================
--- fix-building-for-torchvision.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ fix-building-for-torchvision.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,25 +0,0 @@
-From 011495d8045c44527fbd7796ce860618120ae127 Mon Sep 17 00:00:00 2001
-From: Butui Hu <hot123tea123 at gmail.com>
-Date: Fri, 30 Apr 2021 11:36:30 +0800
-Subject: [PATCH] fix building torchvision
-
----
- aten/src/ATen/core/op_registration/op_allowlist.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/aten/src/ATen/core/op_registration/op_allowlist.h b/aten/src/ATen/core/op_registration/op_allowlist.h
-index f93462bb2cf..12903d1cc09 100644
---- a/aten/src/ATen/core/op_registration/op_allowlist.h
-+++ b/aten/src/ATen/core/op_registration/op_allowlist.h
-@@ -59,7 +59,7 @@ constexpr bool op_allowlist_contains(string_view allowlist, string_view item) {
- // Returns true iff the given op name is on the allowlist
- // and should be registered
- constexpr bool op_allowlist_check(string_view op_name) {
-- assert(op_name.find("::") != string_view::npos);
-+// assert(op_name.find("::") != string_view::npos);
- #if !defined(TORCH_OPERATOR_WHITELIST)
- // If the TORCH_OPERATOR_WHITELIST parameter is not defined,
- // all ops are to be registered
---
-2.31.1
-
Copied: python-pytorch/repos/community-x86_64/fix-building-for-torchvision.patch (from rev 1026012, python-pytorch/trunk/fix-building-for-torchvision.patch)
===================================================================
--- fix-building-for-torchvision.patch (rev 0)
+++ fix-building-for-torchvision.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,25 @@
+From 011495d8045c44527fbd7796ce860618120ae127 Mon Sep 17 00:00:00 2001
+From: Butui Hu <hot123tea123 at gmail.com>
+Date: Fri, 30 Apr 2021 11:36:30 +0800
+Subject: [PATCH] fix building torchvision
+
+---
+ aten/src/ATen/core/op_registration/op_allowlist.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aten/src/ATen/core/op_registration/op_allowlist.h b/aten/src/ATen/core/op_registration/op_allowlist.h
+index f93462bb2cf..12903d1cc09 100644
+--- a/aten/src/ATen/core/op_registration/op_allowlist.h
++++ b/aten/src/ATen/core/op_registration/op_allowlist.h
+@@ -59,7 +59,7 @@ constexpr bool op_allowlist_contains(string_view allowlist, string_view item) {
+ // Returns true iff the given op name is on the allowlist
+ // and should be registered
+ constexpr bool op_allowlist_check(string_view op_name) {
+- assert(op_name.find("::") != string_view::npos);
++// assert(op_name.find("::") != string_view::npos);
+ #if !defined(TORCH_OPERATOR_WHITELIST)
+ // If the TORCH_OPERATOR_WHITELIST parameter is not defined,
+ // all ops are to be registered
+--
+2.31.1
+
Deleted: fix_c10.patch
===================================================================
--- fix_c10.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ fix_c10.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,12 +0,0 @@
-diff --color -aur pytorch-1.9.0-old/c10/core/TensorImpl.h pytorch-1.9.0-new/c10/core/TensorImpl.h
---- pytorch-1.9.0-old/c10/core/TensorImpl.h 2021-08-17 19:33:40.324974399 +0300
-+++ pytorch-1.9.0-new/c10/core/TensorImpl.h 2021-08-18 01:25:00.005901707 +0300
-@@ -2177,7 +2177,7 @@
- // DispatchKeySet
- //
- static_assert(
-- sizeof(void*) != sizeof(int64_t) || // if 64-bit...
-+ sizeof(void*) <= sizeof(int64_t) || // if 64-bit...
- sizeof(TensorImpl) == sizeof(int64_t) * 23,
- "You changed the size of TensorImpl on 64-bit arch."
- "See Note [TensorImpl size constraints] on how to proceed.");
Copied: python-pytorch/repos/community-x86_64/fix_c10.patch (from rev 1026012, python-pytorch/trunk/fix_c10.patch)
===================================================================
--- fix_c10.patch (rev 0)
+++ fix_c10.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,12 @@
+diff --color -aur pytorch-1.9.0-old/c10/core/TensorImpl.h pytorch-1.9.0-new/c10/core/TensorImpl.h
+--- pytorch-1.9.0-old/c10/core/TensorImpl.h 2021-08-17 19:33:40.324974399 +0300
++++ pytorch-1.9.0-new/c10/core/TensorImpl.h 2021-08-18 01:25:00.005901707 +0300
+@@ -2177,7 +2177,7 @@
+ // DispatchKeySet
+ //
+ static_assert(
+- sizeof(void*) != sizeof(int64_t) || // if 64-bit...
++ sizeof(void*) <= sizeof(int64_t) || // if 64-bit...
+ sizeof(TensorImpl) == sizeof(int64_t) * 23,
+ "You changed the size of TensorImpl on 64-bit arch."
+ "See Note [TensorImpl size constraints] on how to proceed.");
Deleted: fix_include_system.patch
===================================================================
--- fix_include_system.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ fix_include_system.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,13 +0,0 @@
-diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
-index ca673033e1..c79ce8d37b 100644
---- a/torch/utils/cpp_extension.py
-+++ b/torch/utils/cpp_extension.py
-@@ -1760,7 +1760,7 @@ def _write_ninja_file_to_build_library(path,
- common_cflags.append(f'-DPYBIND11_{pname}=\\"{pval}\\"')
-
- common_cflags += [f'-I{include}' for include in user_includes]
-- common_cflags += [f'-isystem {include}' for include in system_includes]
-+ common_cflags += [f'-I{include}' for include in system_includes]
-
- common_cflags += ['-D_GLIBCXX_USE_CXX11_ABI=' + str(int(torch._C._GLIBCXX_USE_CXX11_ABI))]
-
Copied: python-pytorch/repos/community-x86_64/fix_include_system.patch (from rev 1026012, python-pytorch/trunk/fix_include_system.patch)
===================================================================
--- fix_include_system.patch (rev 0)
+++ fix_include_system.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,13 @@
+diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
+index ca673033e1..c79ce8d37b 100644
+--- a/torch/utils/cpp_extension.py
++++ b/torch/utils/cpp_extension.py
+@@ -1760,7 +1760,7 @@ def _write_ninja_file_to_build_library(path,
+ common_cflags.append(f'-DPYBIND11_{pname}=\\"{pval}\\"')
+
+ common_cflags += [f'-I{include}' for include in user_includes]
+- common_cflags += [f'-isystem {include}' for include in system_includes]
++ common_cflags += [f'-I{include}' for include in system_includes]
+
+ common_cflags += ['-D_GLIBCXX_USE_CXX11_ABI=' + str(int(torch._C._GLIBCXX_USE_CXX11_ABI))]
+
Deleted: test.py
===================================================================
--- test.py 2021-09-29 23:00:56 UTC (rev 1026012)
+++ test.py 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-import torch
-
-d = torch.device('cuda')
-a = torch.rand(1, 2).to(d)
-print(a + 0)
Copied: python-pytorch/repos/community-x86_64/test.py (from rev 1026012, python-pytorch/trunk/test.py)
===================================================================
--- test.py (rev 0)
+++ test.py 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+import torch
+
+d = torch.device('cuda')
+a = torch.rand(1, 2).to(d)
+print(a + 0)
Deleted: use-system-libuv.patch
===================================================================
--- use-system-libuv.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ use-system-libuv.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,13 +0,0 @@
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 06464e799a..93410bc210 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -1346,7 +1346,7 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
- set(TP_USE_CUDA ON CACHE BOOL "" FORCE)
- set(TP_ENABLE_CUDA_IPC ON CACHE BOOL "" FORCE)
- endif()
-- set(TP_BUILD_LIBUV ON CACHE BOOL "" FORCE)
-+ set(TP_BUILD_LIBUV OFF CACHE BOOL "" FORCE)
- set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE)
-
- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
Copied: python-pytorch/repos/community-x86_64/use-system-libuv.patch (from rev 1026012, python-pytorch/trunk/use-system-libuv.patch)
===================================================================
--- use-system-libuv.patch (rev 0)
+++ use-system-libuv.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,13 @@
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index 06464e799a..93410bc210 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1346,7 +1346,7 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
+ set(TP_USE_CUDA ON CACHE BOOL "" FORCE)
+ set(TP_ENABLE_CUDA_IPC ON CACHE BOOL "" FORCE)
+ endif()
+- set(TP_BUILD_LIBUV ON CACHE BOOL "" FORCE)
++ set(TP_BUILD_LIBUV OFF CACHE BOOL "" FORCE)
+ set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE)
+
+ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
Deleted: xnnpack-gcc11.patch
===================================================================
--- xnnpack-gcc11.patch 2021-09-29 23:00:56 UTC (rev 1026012)
+++ xnnpack-gcc11.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -1,33 +0,0 @@
-From 042cdaf1c24c675fca5e79eb4d2665839d7df2c2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nenad=20Miks=CC=8Ca?= <nenad.miksa at microblink.com>
-Date: Mon, 3 May 2021 13:28:59 +0200
-Subject: [PATCH] GCC 11 no longer needs this polyfill
-
----
- src/xnnpack/intrinsics-polyfill.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/xnnpack/intrinsics-polyfill.h b/src/xnnpack/intrinsics-polyfill.h
-index 3f198d88..32d7d4f3 100644
---- a/src/xnnpack/intrinsics-polyfill.h
-+++ b/src/xnnpack/intrinsics-polyfill.h
-@@ -11,8 +11,8 @@
- #if defined(__SSE2__)
- #include <emmintrin.h>
-
--// GCC any, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
--#if (defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)) || \
-+// GCC pre-11, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
-+#if (defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ < 11) || \
- (defined(__clang__) && !defined(__apple_build_version__) && (__clang_major__ < 8)) || \
- (defined(__clang__) && defined(__ANDROID__) && (__clang_major__ == 8) && (__clang_minor__ == 0) && (__clang_patchlevel__ < 7)) || \
- (defined(__clang__) && defined(__apple_build_version__) && (__apple_build_version__ < 11000000)) || \
-@@ -27,7 +27,7 @@ static XNN_INTRINSIC
- void _mm_storeu_si32(const void* address, __m128i v) {
- *((int*) address) = _mm_cvtsi128_si32(v);
- }
--#endif // GCC any, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
-+#endif // GCC pre-11, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
- #endif // SSE2
-
- #ifdef __AVX512F__
Copied: python-pytorch/repos/community-x86_64/xnnpack-gcc11.patch (from rev 1026012, python-pytorch/trunk/xnnpack-gcc11.patch)
===================================================================
--- xnnpack-gcc11.patch (rev 0)
+++ xnnpack-gcc11.patch 2021-09-29 23:02:04 UTC (rev 1026013)
@@ -0,0 +1,33 @@
+From 042cdaf1c24c675fca5e79eb4d2665839d7df2c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nenad=20Miks=CC=8Ca?= <nenad.miksa at microblink.com>
+Date: Mon, 3 May 2021 13:28:59 +0200
+Subject: [PATCH] GCC 11 no longer needs this polyfill
+
+---
+ src/xnnpack/intrinsics-polyfill.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/xnnpack/intrinsics-polyfill.h b/src/xnnpack/intrinsics-polyfill.h
+index 3f198d88..32d7d4f3 100644
+--- a/src/xnnpack/intrinsics-polyfill.h
++++ b/src/xnnpack/intrinsics-polyfill.h
+@@ -11,8 +11,8 @@
+ #if defined(__SSE2__)
+ #include <emmintrin.h>
+
+-// GCC any, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
+-#if (defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)) || \
++// GCC pre-11, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
++#if (defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ < 11) || \
+ (defined(__clang__) && !defined(__apple_build_version__) && (__clang_major__ < 8)) || \
+ (defined(__clang__) && defined(__ANDROID__) && (__clang_major__ == 8) && (__clang_minor__ == 0) && (__clang_patchlevel__ < 7)) || \
+ (defined(__clang__) && defined(__apple_build_version__) && (__apple_build_version__ < 11000000)) || \
+@@ -27,7 +27,7 @@ static XNN_INTRINSIC
+ void _mm_storeu_si32(const void* address, __m128i v) {
+ *((int*) address) = _mm_cvtsi128_si32(v);
+ }
+-#endif // GCC any, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
++#endif // GCC pre-11, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
+ #endif // SSE2
+
+ #ifdef __AVX512F__
More information about the arch-commits
mailing list