[arch-commits] Commit in python-pytorch/trunk (3 files)
Chih-Hsuan Yen
yan12125 at archlinux.org
Mon Feb 22 11:21:16 UTC 2021
Date: Monday, February 22, 2021 @ 11:21:16
Author: yan12125
Revision: 868492
upgpkg: python-pytorch 1.8.0rc3-1; uploaded to [community-testing] after a talk with svenstaro
Modified:
python-pytorch/trunk/PKGBUILD
python-pytorch/trunk/fix_include_system.patch
python-pytorch/trunk/use-system-libuv.patch
--------------------------+
PKGBUILD | 50 ++++++++++++++++++++++++---------------------
fix_include_system.patch | 6 ++---
use-system-libuv.patch | 14 ++++++------
3 files changed, 37 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-22 11:21:11 UTC (rev 868491)
+++ PKGBUILD 2021-02-22 11:21:16 UTC (rev 868492)
@@ -4,52 +4,54 @@
pkgbase=python-pytorch
pkgname=("python-pytorch" "python-pytorch-opt" "python-pytorch-cuda" "python-pytorch-opt-cuda")
_pkgname="pytorch"
-pkgver=1.7.1
-_pkgver=1.7.1
-pkgrel=6
+pkgver=1.8.0rc3
+_pkgver=1.8.0-rc3
+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-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}-psimd::git+https://github.com/Maratyszcza/psimd.git"
+ "${pkgname}-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git"
+ "${pkgname}-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git"
"${pkgname}-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git"
- "${pkgname}-enum34::git+https://github.com/PeachPy/enum34.git"
- "${pkgname}-cub::git+https://github.com/NVlabs/cub.git"
- "${pkgname}-pybind11::git+https://github.com/seemethere/pybind11.git"
- "${pkgname}-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git"
- "${pkgname}-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git"
"${pkgname}-FP16::git+https://github.com/Maratyszcza/FP16.git"
"${pkgname}-cpuinfo::git+https://github.com/pytorch/cpuinfo.git"
+ "${pkgname}-enum34::git+https://github.com/PeachPy/enum34.git"
"${pkgname}-PeachPy::git+https://github.com/Maratyszcza/PeachPy.git"
- "${pkgname}-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git"
+ "${pkgname}-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git"
+ "${pkgname}-ideep::git+https://github.com/intel/ideep"
+ "${pkgname}-cub::git+https://github.com/NVlabs/cub.git"
"${pkgname}-eigen-git-mirror::git+https://github.com/eigenteam/eigen-git-mirror.git"
"${pkgname}-QNNPACK::git+https://github.com/pytorch/QNNPACK"
+ "${pkgname}-fbjni::git+https://github.com/facebookincubator/fbjni.git"
+ "${pkgname}-foxi::git+https://github.com/houseroad/foxi.git"
+ "${pkgname}-kineto::git+https://github.com/pytorch/kineto"
"${pkgname}-six::git+https://github.com/benjaminp/six.git"
- "${pkgname}-ideep::git+https://github.com/intel/ideep"
- "${pkgname}-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git"
- "${pkgname}-foxi::git+https://github.com/houseroad/foxi.git"
"${pkgname}-gloo::git+https://github.com/facebookincubator/gloo"
- "${pkgname}-fbjni::git+https://github.com/facebookincubator/fbjni.git"
- "${pkgname}-sleef::git+https://github.com/shibatch/sleef"
- "${pkgname}-benchmark::git+https://github.com/google/benchmark.git"
"${pkgname}-nccl::git+https://github.com/NVIDIA/nccl"
"${pkgname}-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt"
+ "${pkgname}-sleef::git+https://github.com/shibatch/sleef"
+ "${pkgname}-gemmlowp::git+https://github.com/google/gemmlowp.git"
"${pkgname}-tbb::git+https://github.com/01org/tbb"
- "${pkgname}-gemmlowp::git+https://github.com/google/gemmlowp.git"
+ "${pkgname}-fbgemm::git+https://github.com/pytorch/fbgemm"
+ "${pkgname}-benchmark::git+https://github.com/google/benchmark.git"
"${pkgname}-tensorpipe::git+https://github.com/pytorch/tensorpipe.git"
- "${pkgname}-fbgemm::git+https://github.com/pytorch/fbgemm"
+ "${pkgname}-XNNPACK::git+https://github.com/google/XNNPACK.git"
+ "${pkgname}-pybind11::git+https://github.com/pybind/pybind11.git"
+ "${pkgname}-fmt::git+https://github.com/fmtlib/fmt.git"
"${pkgname}-googletest::git+https://github.com/google/googletest.git"
+ "${pkgname}-onnx::git+https://github.com/onnx/onnx.git"
+ "${pkgname}-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git"
"${pkgname}-zstd::git+https://github.com/facebook/zstd.git"
- "${pkgname}-XNNPACK::git+https://github.com/google/XNNPACK.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
use-system-libuv2.patch
@@ -89,8 +91,9 @@
'SKIP'
'SKIP'
'SKIP'
- '83c81ec6a461110da6ae6182529f58100986b068c5182ca62cd53c648b4e4fb0'
- '26b1dd596f1e21a011ee18cab939924483d6c6d4d98e543bf76f5a9312d54d67'
+ 'SKIP'
+ '557761502bbd994d9795bef46779e4b8c60ba0b45e7d60841f477d3b7f28a00a'
+ 'cd9ac4aaa9f946ac5eafc57cf66c5c16b3ea7ac8af32c2558fad0705411bb669'
'7b65c3b209fc39f92ba58a58be6d3da40799f1922910b1171ccd9209eda1f9eb'
'e4a96887b41cbdfd4204ce5f16fcb16a23558d23126331794ab6aa30a66f2e0d'
'd3ef8491718ed7e814fe63e81df2f49862fffbea891d2babbcb464796a1bd680')
@@ -133,6 +136,7 @@
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
Modified: fix_include_system.patch
===================================================================
--- fix_include_system.patch 2021-02-22 11:21:11 UTC (rev 868491)
+++ fix_include_system.patch 2021-02-22 11:21:16 UTC (rev 868492)
@@ -1,13 +1,13 @@
diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
-index 7692cad5cd..d6e4a82221 100644
+index ca673033e1..c79ce8d37b 100644
--- a/torch/utils/cpp_extension.py
+++ b/torch/utils/cpp_extension.py
-@@ -1614,7 +1614,7 @@ def _write_ninja_file_to_build_library(path,
+@@ -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))]
- if IS_WINDOWS:
Modified: use-system-libuv.patch
===================================================================
--- use-system-libuv.patch 2021-02-22 11:21:11 UTC (rev 868491)
+++ use-system-libuv.patch 2021-02-22 11:21:16 UTC (rev 868492)
@@ -1,13 +1,13 @@
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 023bbe9e8d..e25aa0aa7f 100644
+index 06464e799a..93410bc210 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
-@@ -1308,7 +1308,7 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
- if(MSVC)
- message(WARNING "Tensorpipe cannot be used on Windows.")
- else()
+@@ -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_ENABLE_SHM OFF CACHE BOOL "" FORCE)
- set(TP_ENABLE_CMA OFF CACHE BOOL "" FORCE)
set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE)
+
+ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
More information about the arch-commits
mailing list