Date: Friday, June 30, 2017 @ 17:47:42 Author: svenstaro Revision: 241714
upgpkg: tensorflow 1.2.1-2 Fix up python imports with a patch Added: tensorflow/trunk/11174.patch Modified: tensorflow/trunk/PKGBUILD -------------+ 11174.patch | 36 ++++++++++++++++++++++++++++++++++++ PKGBUILD | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) Added: 11174.patch =================================================================== --- 11174.patch (rev 0) +++ 11174.patch 2017-06-30 17:47:42 UTC (rev 241714) @@ -0,0 +1,36 @@ +From 0c0005e3eb83b0e0c4903d2ec4223a58ef115e54 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C3=ABl=20Defferrard?= <michael.defferr...@epfl.ch> +Date: Fri, 30 Jun 2017 13:47:39 +0000 +Subject: [PATCH] Only use weakref.finalize from backports in Python < 3.4 + +--- + tensorflow/python/util/tf_should_use.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/tensorflow/python/util/tf_should_use.py b/tensorflow/python/util/tf_should_use.py +index 05c99856d27..491b78f1dd3 100644 +--- a/tensorflow/python/util/tf_should_use.py ++++ b/tensorflow/python/util/tf_should_use.py +@@ -25,7 +25,12 @@ + + import six # pylint: disable=unused-import + +-from backports import weakref # pylint: disable=g-bad-import-order ++# pylint: disable=g-bad-import-order ++try: ++ from weakref import finalize ++except ImportError: ++ from backports.weakref import finalize ++# pylint: enable=g-bad-import-order + + from tensorflow.python.platform import tf_logging + from tensorflow.python.util import tf_decorator +@@ -107,7 +112,7 @@ def __init__(self, true_self): + # garbage collected. Can't add self as the args because the + # loop will break garbage collection. We keep track of + # ourselves via python ids. +- weakref.finalize(self, _deleted, self._tf_ref_id, fatal_error) ++ finalize(self, _deleted, self._tf_ref_id, fatal_error) + + # Not sure why this pylint warning is being used; this is not an + # old class form. Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-30 17:23:49 UTC (rev 241713) +++ PKGBUILD 2017-06-30 17:47:42 UTC (rev 241714) @@ -5,7 +5,7 @@ pkgbase=tensorflow pkgname=(tensorflow tensorflow-cuda python-tensorflow python-tensorflow-cuda) pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for computation using data flow graphs for scalable machine learning" url="https://www.tensorflow.org/" license=('Apache2') @@ -13,13 +13,17 @@ makedepends=('git' 'bazel' 'python-numpy' 'gcc5' 'cuda' 'cudnn' 'python-pip' 'python-wheel' 'python-setuptools') source=("https://github.com/tensorflow/tensorflow/archive/v${pkgver}.tar.gz" 10868.patch + 11174.patch https://raw.githubusercontent.com/tensorflow/tensorflow/847484e39485dc727dd72a0970d5bfb5c2d5e538/tensorflow/c/generate-pc.sh) sha512sums=('bed3d2173db41d5d6882dbe2bafac3b6cd541acc2e6bb73c838fbf34160a3fe4cff83e0ee0cf79a8081928701cc9752dc5bea7bf733ffadb7745a974e0467b0f' '90940827ea6cbc6694b14ea276a37c5f8af027317873d67a8b40802d8d75a81984c283335bf62cc5b5fa63023c9cc9b414a145d3019124127c5f15472bfdfcec' + 'a6c13050a1e5398546e3879a5ce805211b79a5947becb486974e67cedfd1dae87773a21a4614343eca6f956ceda9e5b46e0ac7f259b685a83f412f41d051a6b7' '9a1d82df83881c662d088ccd5b21abcb8b46726f2090f64d968d270d99e3b7bbd6b3c9dae6e83479ff724a47238384df95ed67d0d096d97231c793e7f63a1034') prepare() { patch -Np1 -d tensorflow-${pkgver} < ${srcdir}/10868.patch + patch -Np1 -d tensorflow-${pkgver} < ${srcdir}/11174.patch + # We'll not need this in >1.2 cp ${srcdir}/generate-pc.sh tensorflow-${pkgver}/tensorflow/c/generate-pc.sh