[arch-commits] Commit in tensorflow/trunk (33953.patch PKGBUILD)

[Sven-Hendrik Haase]

    Date: Monday, November 18, 2019 @ 06:06:05
  Author: svenstaro
Revision: 530278

upgpkg: tensorflow 2.0.0-5

Added:
  tensorflow/trunk/33953.patch
Modified:
  tensorflow/trunk/PKGBUILD

-------------+
 33953.patch |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD    |   11 +++++---
 2 files changed, 81 insertions(+), 4 deletions(-)

Added: 33953.patch
===================================================================
--- 33953.patch	                        (rev 0)
+++ 33953.patch	2019-11-18 06:06:05 UTC (rev 530278)
@@ -0,0 +1,74 @@
+From ea3063c929c69f738bf65bc99dad1159803e772f Mon Sep 17 00:00:00 2001
+From: Yong Tang <yong.tang.github at outlook.com>
+Date: Sun, 3 Nov 2019 19:52:04 +0000
+Subject: [PATCH 1/2] Fix TensorFlow on Python 3.8 logger issue
+
+This fix tries to address the issue raised in 33799
+where running tensorflow on python 3.8 (Ubuntu 18.04)
+raised the following error:
+```
+TypeError: _logger_find_caller() takes from 0 to 1 positional arguments but 2 were given
+```
+
+The issue was that findCaller changed in Python 3.8
+
+This PR fixes the issue.
+
+This PR fixes 33799
+
+Signed-off-by: Yong Tang <yong.tang.github at outlook.com>
+---
+ tensorflow/python/platform/tf_logging.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/tensorflow/python/platform/tf_logging.py b/tensorflow/python/platform/tf_logging.py
+index 86a4957c9da6..a397393e7f7e 100644
+--- a/tensorflow/python/platform/tf_logging.py
++++ b/tensorflow/python/platform/tf_logging.py
+@@ -57,9 +57,18 @@ def _get_caller(offset=3):
+     f = f.f_back
+   return None, None
+ 
+-
+ # The definition of `findCaller` changed in Python 3.2
+-if _sys.version_info.major >= 3 and _sys.version_info.minor >= 2:
++if _sys.version_info.major >= 3 and _sys.version_info.minor >= 8:
++  def _logger_find_caller(stack_info=False, stacklevel=1):  # pylint: disable=g-wrong-blank-lines
++    code, frame = _get_caller(4)
++    sinfo = None
++    if stack_info:
++      sinfo = '\n'.join(_traceback.format_stack())
++    if code:
++      return (code.co_filename, frame.f_lineno, code.co_name, sinfo)
++    else:
++      return '(unknown file)', 0, '(unknown function)', sinfo
++elif _sys.version_info.major >= 3 and _sys.version_info.minor >= 2:
+   def _logger_find_caller(stack_info=False):  # pylint: disable=g-wrong-blank-lines
+     code, frame = _get_caller(4)
+     sinfo = None
+
+From 507d1888156ec7c13d61c50c7a440abc86b3b48b Mon Sep 17 00:00:00 2001
+From: Yong Tang <yong.tang.github at outlook.com>
+Date: Sun, 3 Nov 2019 19:54:20 +0000
+Subject: [PATCH 2/2] Update comment explaining python 3.8 change for
+ findCaller
+
+Signed-off-by: Yong Tang <yong.tang.github at outlook.com>
+---
+ tensorflow/python/platform/tf_logging.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tensorflow/python/platform/tf_logging.py b/tensorflow/python/platform/tf_logging.py
+index a397393e7f7e..7c307b1f0a72 100644
+--- a/tensorflow/python/platform/tf_logging.py
++++ b/tensorflow/python/platform/tf_logging.py
+@@ -57,7 +57,8 @@ def _get_caller(offset=3):
+     f = f.f_back
+   return None, None
+ 
+-# The definition of `findCaller` changed in Python 3.2
++# The definition of `findCaller` changed in Python 3.2,
++# and further changed in Python 3.8
+ if _sys.version_info.major >= 3 and _sys.version_info.minor >= 8:
+   def _logger_find_caller(stack_info=False, stacklevel=1):  # pylint: disable=g-wrong-blank-lines
+     code, frame = _get_caller(4)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-18 05:15:37 UTC (rev 530277)
+++ PKGBUILD	2019-11-18 06:06:05 UTC (rev 530278)
@@ -1,5 +1,5 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Co-Maintainer: Konstantin Gizdov (kgizdov) <arch at kge.pw>
+# Maintainer: Konstantin Gizdov (kgizdov) <arch at kge.pw>
 # Contributor: Adria Arrufat (archdria) <adria.arrufat+AUR at protonmail.ch>
 # Contributor: Thibault Lorrain (fredszaq) <fredszaq at gmail.com>
 
@@ -7,7 +7,7 @@
 pkgname=(tensorflow tensorflow-opt tensorflow-cuda tensorflow-opt-cuda python-tensorflow python-tensorflow-opt python-tensorflow-cuda python-tensorflow-opt-cuda)
 pkgver=2.0.0
 _pkgver=2.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -20,10 +20,12 @@
             'python-pasta: tf_upgrade_v2 tool')
 source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
         'python-3.8.patch'
-        'glibc-2.30.patch')
+        'glibc-2.30.patch'
+        '33953.patch')
 sha512sums=('c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc'
             'ef06196f1a7f5a4dff4d83916566dae8f2f2c2993ddcd40017583020dd9bfc73ef426c45b0cc5630d1dd53321b99736f2c60b37bb9370be02174c1209e041ffb'
-            'a9345b7206e9f8ae9fc33987997808dcdeaf3e4c05caf40785bba2a9ef2292e20046bfd54ce05fee2ccd11ded9d8e918b2a131d830a7e238406e6ddf222e830e')
+            'a9345b7206e9f8ae9fc33987997808dcdeaf3e4c05caf40785bba2a9ef2292e20046bfd54ce05fee2ccd11ded9d8e918b2a131d830a7e238406e6ddf222e830e'
+            'ad06e7553e1a6961ac53eed626c8a390c5dc8967cb172cc07ccc45e4ccef495c15e4a273c469df957a0971c64d9585b3493ff74e863a4f6f53a1e1f676b45870')
 
 get_pyver () {
     python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
@@ -32,6 +34,7 @@
 prepare() {
   patch -Np1 -d tensorflow-${_pkgver} <python-3.8.patch
   patch -Np1 -d tensorflow-${_pkgver} <glibc-2.30.patch
+  patch -Np1 -d tensorflow-${_pkgver} <33953.patch
 
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-cuda