Date: Friday, March 3, 2023 @ 13:29:18
Author: svenstaro
Revision: 1409390
upgpkg: python-pytorch 2.0.0rc3-1
Added:
python-pytorch/trunk/disable-werror1.patch
python-pytorch/trunk/disable-werror2.patch
python-pytorch/trunk/disable-werror3.patch
python-pytorch/trunk/disable-werror4.patch
Modified:
python-pytorch/trunk/PKGBUILD
Deleted:
python-pytorch/trunk/cuda_arch_update.patch
------------------------+
PKGBUILD | 33 +++++++++++++++++---------
cuda_arch_update.patch | 58 -----------------------------------------------
disable-werror1.patch | 13 ++++++++++
disable-werror2.patch | 13 ++++++++++
disable-werror3.patch | 13 ++++++++++
disable-werror4.patch | 15 ++++++++++++
6 files changed, 75 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-03 13:09:22 UTC (rev 1409389)
+++ PKGBUILD 2023-03-03 13:29:18 UTC (rev 1409390)
@@ -4,9 +4,9 @@
_pkgname=pytorch
pkgbase="python-${_pkgname}"
pkgname=("${pkgbase}" "${pkgbase}-opt" "${pkgbase}-cuda" "${pkgbase}-opt-cuda")
-pkgver=1.13.1
-_pkgver=1.13.1
-pkgrel=3
+pkgver=2.0.0rc3
+_pkgver=2.0.0-rc3
+pkgrel=1
_pkgdesc='Tensors and Dynamic neural networks in Python with strong GPU
acceleration'
pkgdesc="${_pkgdesc}"
arch=('x86_64')
@@ -16,7 +16,7 @@
'python-numpy' 'protobuf' 'ffmpeg4.4' 'python-future' 'qt5-base'
'intel-oneapi-mkl'
'python-typing_extensions')
makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake'
'cuda'
- 'cudnn' 'git' 'magma' 'ninja' 'pkgconfig' 'doxygen' 'gcc11'
'onednn'
+ 'cudnn' 'git' 'magma' 'ninja' 'pkgconfig' 'doxygen' 'onednn'
'vulkan-headers' 'shaderc')
source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver";
# generated using parse-submodules
@@ -65,7 +65,10 @@
use-system-libuv.patch
fix-building-for-torchvision.patch
87773.patch
- cuda_arch_update.patch
+ disable-werror1.patch
+ disable-werror2.patch
+ disable-werror3.patch
+ disable-werror4.patch
ffmpeg4.4.patch)
b2sums=('SKIP'
'SKIP'
@@ -113,7 +116,10 @@
'1f7ce593fa9fc62535ca1c3d85c996a73006cc614c7b7258160c3fc53cd52a1cfddcb18baf897f2e1223ecdfee52ca1471b91c9f845368ed6ac51b66f6e0e676'
'fdea0b815d7750a4233c1d4668593020da017aea43cf4cb63b4c00d0852c7d34f0333e618fcf98b8df2185313a2089b8c2e9fe8ec3cfb0bf693598f9c61461a8'
'0a8fc110a306e81beeb9ddfb3a1ddfd26aeda5e3f7adfb0f7c9bc3fd999c2dde62e0b407d3eca573097a53fd97329214e30e8767fb38d770197c7ec2b53daf18'
-
'2a540c5beb978bcda1e3375d82526fb088409cd9ba0be3aa8f411477dd935b75bab2b4a4a79cecffeee91e8c6a3a716884508d17b9a558979dbb5059458bd0d3'
+
'844d0b7b39777492a6d456fa845d5399f673b4bb37b62473393449c9ad0c29dca3c33276dc3980f2e766680100335c0acfb69d51781b79575f4da112d9c4018c'
+
'985e331b2025e1ca5a4fba5188af0900f1f38bd0fd32c9173deb8bed7358af01e387d4654c7e0389e5f98b6f7cbed053226934d180b8b3b1270bdbbb36fc89b2'
+
'96de2729b29c7ce3e4fdd8008f575d24c2c3ef9f85d6217e607902d7b870ac71b9290fde71e87a68d75bb75ef28eacbf5ce04e071146809ccf1e76a03f97b479'
+
'eea86bbed0a37e1661035913536456f90e0cd1e687c7e4103011f0688bc8347b6fc2ff82019909c41e7c89ddbc3b80dde641e88abf406f4faebc71b0bb693d25'
'6286b05d5b5143f117363e3ce3c7d693910f53845aeb6f501b3eea64aa71778cb2d7dcd4ac945d5321ef23b4da02446e86dedc6a9b6a998df4a7f3b1ce50550a')
options=('!lto')
@@ -183,8 +189,11 @@
# Fix building against glog 0.6
patch -Np1 -i "${srcdir}/87773.patch"
- # Update supported CUDA compute architectures
- patch -Np1 -i "${srcdir}/cuda_arch_update.patch"
+ # Disable -Werror
+ patch -Np1 -d third_party/fbgemm -i "${srcdir}/disable-werror1.patch"
+ patch -Np1 -d third_party/benchmark -i "${srcdir}/disable-werror2.patch"
+ patch -Np1 -d third_party/ideep/mkl-dnn -i "${srcdir}/disable-werror3.patch"
+ patch -Np1 -i "${srcdir}/disable-werror4.patch"
# build against ffmpeg4.4
patch -Np1 -i "${srcdir}/ffmpeg4.4.patch"
@@ -220,12 +229,12 @@
# 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 CC=/usr/bin/gcc-11
- export CXX=/usr/bin/g++-11
- export CUDAHOSTCXX=/usr/bin/g++-11
+ export CC=/usr/bin/gcc
+ export CXX=/usr/bin/g++
+ export CUDAHOSTCXX=/opt/cuda/bin/g++
export CUDA_HOST_COMPILER="${CUDAHOSTCXX}"
export CUDA_HOME=/opt/cuda
- # hide buildt-time CUDA devices
+ # hide build-time CUDA devices
export CUDA_VISIBLE_DEVICES=""
export CUDNN_LIB_DIR=/usr/lib
export CUDNN_INCLUDE_DIR=/usr/include
Deleted: cuda_arch_update.patch
===================================================================
--- cuda_arch_update.patch 2023-03-03 13:09:22 UTC (rev 1409389)
+++ cuda_arch_update.patch 2023-03-03 13:29:18 UTC (rev 1409390)
@@ -1,58 +0,0 @@
-From 71fe069d985e97b5947d133f2f2bde9adea01ed7 Mon Sep 17 00:00:00 2001
-From: Greg Hogan <[email protected]>
-Date: Mon, 24 Oct 2022 21:25:36 +0000
-Subject: [PATCH] ada lovelace (arch 8.9) support (#87436)
-
-changes required to be able to compile https://github.com/pytorch/vision and
https://github.com/nvidia/apex for `sm_89` architecture
-Pull Request resolved: https://github.com/pytorch/pytorch/pull/87436
-Approved by: https://github.com/ngimel
----
- .../upstream/FindCUDA/select_compute_arch.cmake | 11 +++++++++++
- torch/utils/cpp_extension.py | 3 ++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git
a/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
b/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
-index 7f22d476d2fbe..822c041ee5268 100644
---- a/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
-+++ b/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
-@@ -98,8 +98,22 @@ if(NOT CUDA_VERSION VERSION_LESS "11.1")
- list(APPEND CUDA_ALL_GPU_ARCHITECTURES "8.6")
- set(CUDA_LIMIT_GPU_ARCHITECUTRE "8.6")
-
-+ if(CUDA_VERSION VERSION_LESS "11.8")
-+ set(CUDA_LIMIT_GPU_ARCHITECTURE "8.9")
-+ endif()
-+endif()
-+
-+if(NOT CUDA_VERSION VERSION_LESS "11.8")
-+ list(APPEND CUDA_KNOWN_GPU_ARCHITECTURES "Ada")
-+ list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "8.9")
-+ list(APPEND CUDA_ALL_GPU_ARCHITECTURES "8.9")
-+ list(APPEND CUDA_KNOWN_GPU_ARCHITECTURES "Hopper")
-+ list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "9.0")
-+ list(APPEND CUDA_ALL_GPU_ARCHITECTURES "9.0")
-+
- if(CUDA_VERSION VERSION_LESS "12.0")
- set(CUDA_LIMIT_GPU_ARCHITECTURE "9.0")
-+ list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "8.9+PTX")
- endif()
- endif()
-
-diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
-index 36811bf22dedc..612ae9fdf0785 100644
---- a/torch/utils/cpp_extension.py
-+++ b/torch/utils/cpp_extension.py
-@@ -1729,10 +1729,12 @@ def _get_cuda_arch_flags(cflags: Optional[List[str]] =
None) -> List[str]:
- ('Volta', '7.0+PTX'),
- ('Turing', '7.5+PTX'),
- ('Ampere', '8.0;8.6+PTX'),
-+ ('Ada', '8.9+PTX'),
-+ ('Hopper', '9.0+PTX'),
- ])
-
- supported_arches = ['3.5', '3.7', '5.0', '5.2', '5.3', '6.0', '6.1',
'6.2',
-- '7.0', '7.2', '7.5', '8.0', '8.6']
-+ '7.0', '7.2', '7.5', '8.0', '8.6', '8.9', '9.0']
- valid_arch_strings = supported_arches + [s + "+PTX" for s in
supported_arches]
-
- # The default is sm_30 for CUDA 9.x and 10.x
Added: disable-werror1.patch
===================================================================
--- disable-werror1.patch (rev 0)
+++ disable-werror1.patch 2023-03-03 13:29:18 UTC (rev 1409390)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 58dcb9a..269a7a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,7 +144,7 @@ if(MSVC)
+ else(MSVC)
+ string(APPEND CMAKE_CXX_FLAGS " -Wall")
+ string(APPEND CMAKE_CXX_FLAGS " -Wextra")
+- string(APPEND CMAKE_CXX_FLAGS " -Werror")
++ # string(APPEND CMAKE_CXX_FLAGS " -Werror")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
+ target_compile_options(fbgemm_avx2 PRIVATE
+ "-m64" "-mavx2" "-mf16c" "-mfma")
Added: disable-werror2.patch
===================================================================
--- disable-werror2.patch (rev 0)
+++ disable-werror2.patch 2023-03-03 13:29:18 UTC (rev 1409390)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8852e4..cf1d447 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@ option(BENCHMARK_ENABLE_TESTING "Enable testing of the
benchmark library." ON)
+ option(BENCHMARK_ENABLE_EXCEPTIONS "Enable the use of exceptions in the
benchmark library." ON)
+ option(BENCHMARK_ENABLE_LTO "Enable link time optimisation of the benchmark
library." OFF)
+ option(BENCHMARK_USE_LIBCXX "Build and test using libc++ as the standard
library." OFF)
+-option(BENCHMARK_ENABLE_WERROR "Build Release candidates with -Werror." ON)
++option(BENCHMARK_ENABLE_WERROR "Build Release candidates with -Werror." OFF)
+ option(BENCHMARK_FORCE_WERROR "Build Release candidates with -Werror
regardless of compiler issues." OFF)
+
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
Added: disable-werror3.patch
===================================================================
--- disable-werror3.patch (rev 0)
+++ disable-werror3.patch 2023-03-03 13:29:18 UTC (rev 1409390)
@@ -0,0 +1,13 @@
+diff --git a/cmake/platform.cmake b/cmake/platform.cmake
+index b588bcc23..81283ab70 100644
+--- a/cmake/platform.cmake
++++ b/cmake/platform.cmake
+@@ -110,7 +110,7 @@ if(MSVC)
+ append(CMAKE_CCXX_FLAGS "/fp:precise")
+ endif()
+ elseif(UNIX OR MINGW)
+- append(CMAKE_CCXX_FLAGS "-Wall -Werror -Wno-unknown-pragmas")
++ append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas")
+ if(DNNL_GRAPH_WITH_SYCL OR CMAKE_BASE_NAME STREQUAL "icx" OR
CMAKE_BASE_NAME STREQUAL "icpx")
+ # When using Debug build mode CMake adds "-g" option without "-O0"
+ # causing the warning. This probably happens because clang/gcc
compilers
Added: disable-werror4.patch
===================================================================
--- disable-werror4.patch (rev 0)
+++ disable-werror4.patch 2023-03-03 13:29:18 UTC (rev 1409390)
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b9addcf005b..27d2c761f4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -797,10 +797,8 @@ if(NOT MSVC)
+ # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
+ string(APPEND CMAKE_CXX_FLAGS " -Wall")
+ string(APPEND CMAKE_CXX_FLAGS " -Wextra")
+- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS)
+ append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS)
+ append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS)
+- append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS)
+ append_cxx_flag_if_supported("-Werror=bool-operation" CMAKE_CXX_FLAGS)
+ append_cxx_flag_if_supported("-Wnarrowing" CMAKE_CXX_FLAGS)
+ append_cxx_flag_if_supported("-Wno-missing-field-initializers"
CMAKE_CXX_FLAGS)
