[arch-commits] Commit in python-pytorch/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Friday, January 17, 2020 @ 05:16:14
  Author: svenstaro
Revision: 552815

upgpkg: python-pytorch 1.4.0-1

Modified:
  python-pytorch/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-17 05:15:09 UTC (rev 552814)
+++ PKGBUILD	2020-01-17 05:16:14 UTC (rev 552815)
@@ -1,11 +1,11 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# 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.3.1
-pkgrel=8
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
 arch=('x86_64')
 url="https://pytorch.org"
@@ -13,9 +13,13 @@
 depends=('google-glog' 'gflags' 'opencv' 'openmp' 'nccl' 'pybind11' 'python' 'python-yaml' 'python-numpy' 'protobuf' 'ffmpeg' 'python-future' 'qt5-base')
 makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake' 'cuda' 'cudnn' 'git' 'magma')
 source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$pkgver"
-        fix_include_system.patch)
+        fix_include_system.patch
+        https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch
+        https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch)
 sha256sums=('SKIP'
-            '147bdaeac8ec46ea46382e6146878bd8f8d51e05d5bd6f930dfd8e2b520859b9')
+            '147bdaeac8ec46ea46382e6146878bd8f8d51e05d5bd6f930dfd8e2b520859b9'
+            '3170551116798dc496636a87f00b86c6463895bb6d174df616c5224adfb74ff3'
+            'c8c305c892be85c47872ae1f1ecd5b3b8af12876fbfe3641045c8c839e5126da')
 
 get_pyver () {
   python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
@@ -34,12 +38,13 @@
   # https://github.com/pytorch/pytorch/issues/26555
   sed -i 's#^  ${CMAKE_CURRENT_SOURCE_DIR}/tensor_iterator_test.cpp##g' aten/src/ATen/test/CMakeLists.txt
 
-  # Fix build with Python 3.8
-  # https://github.com/pytorch/pytorch/issues/28060
-  find -name '*.cpp' -exec sed -i '/tp_print/s/nullptr/0/' {} +
-
+  # https://bugs.archlinux.org/task/64981
   patch -N torch/utils/cpp_extension.py "${srcdir}"/fix_include_system.patch
 
+  # https://github.com/pytorch/pytorch/issues/32277
+  patch -Np1 -i "$srcdir"/30332.patch
+  patch -Np1 -i "$srcdir"/30333.patch
+
   cd ..
 
   cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt"