Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
python-pytorch
Commits:
a6902756 by Antonio Rojas at 2024-02-18T10:27:36+01:00
upgpkg: 2.2.0-2: google-glog 0.7 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + glog-0.7.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = python-pytorch
pkgdesc = Tensors and Dynamic neural networks in Python with strong GPU
acceleration
pkgver = 2.2.0
- pkgrel = 1
+ pkgrel = 2
url = https://pytorch.org
arch = x86_64
license = BSD
@@ -98,6 +98,7 @@ pkgbase = python-pytorch
source = disable-werror4.patch
source = rocblas-batched.patch
source = protobuf-23.patch
+ source = glog-0.7.patch
source = pytorch-rocm-jit.patch
source = pytorch-missing-iostream.patch
source = python-pytorch-ffmpeg6.patch
@@ -154,6 +155,7 @@ pkgbase = python-pytorch
b2sums =
eea86bbed0a37e1661035913536456f90e0cd1e687c7e4103011f0688bc8347b6fc2ff82019909c41e7c89ddbc3b80dde641e88abf406f4faebc71b0bb693d25
b2sums =
232d2aca7cae8da511d1451890f8696d47da72276929ac5731a1a1a481d2a515fa7288bf33730d8ea2c892616551a74ca2439b53de6b1dfee156c30919120741
b2sums =
738199e7a11940c839a43ac4e3152d84e15b9cde638227d3d87ecb45f82c5e76630a56c49bcfb08e841f92be1b2311f2fad4fafdcc17f5b00b7a8ef6d962f250
+ b2sums =
20d044c5c80354af5ed63847fa4332e96cbfc32a351788f6458fb92b322de7f64b10c188ff26e4f34e422cfe30e082c3ca23ee3e9094616c142aa53588dd451e
b2sums =
e19fbb32da5a3bdd9d1505b2ba79ff0d765b241da819c96a380a5c871be4f5a78dcad000e01a315d936cfebb7860150f8111e60aed17cbb9337896a0831df0fe
b2sums =
77458fa568692020ae4e437b1ebae6ebbf59f040b3414ba03e32cc829f1befb9f39dde6e0c0525e30d42dd08d482d2f213dd8294a9877476c7d0d6aabb0f08d3
b2sums =
c17c2d2c085795861cb46974e8e251a0eb576c35a1dd2d75bcb880119bcc800c49bf6bc25c8f671c984b48787b5b919ef946352e299dc13d3ff763ae1bcc33a4
=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@ pkgbase="python-${_pkgname}"
pkgname=("${pkgbase}" "${pkgbase}-opt" "${pkgbase}-cuda" "${pkgbase}-opt-cuda"
"${pkgbase}-rocm" "${pkgbase}-opt-rocm")
pkgver=2.2.0
_pkgver=2.2.0
-pkgrel=1
+pkgrel=2
_pkgdesc='Tensors and Dynamic neural networks in Python with strong GPU
acceleration'
pkgdesc="${_pkgdesc}"
arch=('x86_64')
@@ -71,6 +71,7 @@
source=("${_pkgname}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver";
disable-werror4.patch
rocblas-batched.patch
protobuf-23.patch
+ glog-0.7.patch
pytorch-rocm-jit.patch
pytorch-missing-iostream.patch
python-pytorch-ffmpeg6.patch
@@ -127,6 +128,7 @@ b2sums=('SKIP'
'eea86bbed0a37e1661035913536456f90e0cd1e687c7e4103011f0688bc8347b6fc2ff82019909c41e7c89ddbc3b80dde641e88abf406f4faebc71b0bb693d25'
'232d2aca7cae8da511d1451890f8696d47da72276929ac5731a1a1a481d2a515fa7288bf33730d8ea2c892616551a74ca2439b53de6b1dfee156c30919120741'
'738199e7a11940c839a43ac4e3152d84e15b9cde638227d3d87ecb45f82c5e76630a56c49bcfb08e841f92be1b2311f2fad4fafdcc17f5b00b7a8ef6d962f250'
+
'20d044c5c80354af5ed63847fa4332e96cbfc32a351788f6458fb92b322de7f64b10c188ff26e4f34e422cfe30e082c3ca23ee3e9094616c142aa53588dd451e'
'e19fbb32da5a3bdd9d1505b2ba79ff0d765b241da819c96a380a5c871be4f5a78dcad000e01a315d936cfebb7860150f8111e60aed17cbb9337896a0831df0fe'
'77458fa568692020ae4e437b1ebae6ebbf59f040b3414ba03e32cc829f1befb9f39dde6e0c0525e30d42dd08d482d2f213dd8294a9877476c7d0d6aabb0f08d3'
'c17c2d2c085795861cb46974e8e251a0eb576c35a1dd2d75bcb880119bcc800c49bf6bc25c8f671c984b48787b5b919ef946352e299dc13d3ff763ae1bcc33a4'
@@ -202,6 +204,9 @@ prepare() {
# Fix building against glog 0.6
patch -Np1 -i "${srcdir}/87773.patch"
+
+ # Fix building against glog 0.7
+ patch -p1 -i "${srcdir}/glog-0.7.patch"
# Disable -Werror
patch -Np1 -d third_party/fbgemm -i "${srcdir}/disable-werror1.patch"
=====================================
glog-0.7.patch
=====================================
@@ -0,0 +1,28 @@
+diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp
+index f4eef35b147..5a0a850650e 100644
+--- a/c10/util/Logging.cpp
++++ b/c10/util/Logging.cpp
+@@ -280,20 +280,20 @@ void UpdateLoggingLevelsFromFlags() {
+ #endif
+ // If caffe2_log_level is set and is lower than the min log level by glog,
+ // we will transfer the caffe2_log_level setting to glog to override that.
+- FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level, FLAGS_minloglevel);
++ FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level,
static_cast<int>(FLAGS_minloglevel));
+ // If caffe2_log_level is explicitly set, let's also turn on logtostderr.
+ if (FLAGS_caffe2_log_level < google::GLOG_WARNING) {
+ FLAGS_logtostderr = 1;
+ }
+ // Also, transfer the caffe2_log_level verbose setting to glog.
+ if (FLAGS_caffe2_log_level < 0) {
+- FLAGS_v = std::min(FLAGS_v, -FLAGS_caffe2_log_level);
++ FLAGS_v = std::min(FLAGS_v, static_cast<int>(-FLAGS_caffe2_log_level));
+ }
+ }
+
+ void ShowLogInfoToStderr() {
+ FLAGS_logtostderr = 1;
+- FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO);
++ FLAGS_minloglevel = std::min(FLAGS_minloglevel,
static_cast<int>(google::GLOG_INFO));
+ }
+ } // namespace c10
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/python-pytorch/-/commit/a6902756241349dea79d73af9381563624c0aefd
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/python-pytorch/-/commit/a6902756241349dea79d73af9381563624c0aefd
You're receiving this email because of your account on gitlab.archlinux.org.
