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

Sven-Hendrik Haase svenstaro at archlinux.org
Mon Aug 13 17:06:48 UTC 2018


    Date: Monday, August 13, 2018 @ 17:06:48
  Author: svenstaro
Revision: 371310

upgpkg: tensorflow 1.10.0-1

Added:
  tensorflow/trunk/21017.patch
Modified:
  tensorflow/trunk/PKGBUILD
  tensorflow/trunk/python37.patch

----------------+
 21017.patch    |   21 +++++++++++++++++++++
 PKGBUILD       |   25 ++++++++++++-------------
 python37.patch |   21 +++++++++++++++------
 3 files changed, 48 insertions(+), 19 deletions(-)

Added: 21017.patch
===================================================================
--- 21017.patch	                        (rev 0)
+++ 21017.patch	2018-08-13 17:06:48 UTC (rev 371310)
@@ -0,0 +1,21 @@
+From fb8d1ca4eaefe58d42c27b6fc676f64f137f4675 Mon Sep 17 00:00:00 2001
+From: Ray Kim <msca8h at naver.com>
+Date: Sat, 21 Jul 2018 21:42:15 +0900
+Subject: [PATCH] fixed build error on gcc-7
+
+---
+ tensorflow/compiler/xla/service/gpu/xfeed_queue.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tensorflow/compiler/xla/service/gpu/xfeed_queue.h b/tensorflow/compiler/xla/service/gpu/xfeed_queue.h
+index 737c7eb0253..dd46ff433ba 100644
+--- a/tensorflow/compiler/xla/service/gpu/xfeed_queue.h
++++ b/tensorflow/compiler/xla/service/gpu/xfeed_queue.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ #define TENSORFLOW_COMPILER_XLA_SERVICE_GPU_XFEED_QUEUE_H_
+ 
+ #include <deque>
++#include <functional>
+ #include <vector>
+ 
+ #include "tensorflow/core/platform/mutex.h"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-13 16:58:21 UTC (rev 371309)
+++ PKGBUILD	2018-08-13 17:06:48 UTC (rev 371310)
@@ -4,9 +4,9 @@
 
 pkgbase=tensorflow
 pkgname=(tensorflow tensorflow-opt tensorflow-cuda tensorflow-opt-cuda python-tensorflow python-tensorflow-opt python-tensorflow-cuda python-tensorflow-opt-cuda)
-pkgver=1.9.0
-_pkgver=1.9.0
-pkgrel=3
+pkgver=1.10.0
+_pkgver=1.10.0
+pkgrel=1
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -15,24 +15,22 @@
              'cudnn' 'python-pip' 'python-wheel' 'python-setuptools')
 optdepends=('tensorboard: Tensorflow visualization toolkit')
 source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
-        update-cython.patch
-        update-protobuf.patch
         python37.patch
         protobuf-python37.patch
-        protobuf-python37-apply.patch)
-sha512sums=('eb25dafccf2ec600c4ca28612362c8317b8b9160610ca9fb60f265815651c155b19ae5be3f213a0d9e716d9e25637d6502164433955247cf6fa5d75408b7ac84'
-            '4f91312e4744ed03bb5bdb7e2403a167d8cbb8e4ceb7a8ad062316609bb4988e28737131f2b5ffd115d8d8b4be90d8da1d186a61fe1d37b2b72cb5a91f6d77bc'
-            'e2433942d071862325b3c201a79239347ba30a664d86d27bbcccb6769ec914f0f4bd878986790512c8b7486d1ac1a72fe61f64357b74e52e7ec45188900efd6c'
-            '9e4af5901cdff1fe877f981721193cfe6bfdc0b059e970f33a4896c53118f1f3dc7bb26dc8f9064eba7a9ac7ada5cb32bb26fc90afb188c490abb4e4aab5179a'
+        protobuf-python37-apply.patch
+        21017.patch)
+sha512sums=('a25257ad7e561c2040ba9dda699acb24b757e6d79c60324cab20d8d8a428fef79a06a3627a95a59e2c8408a094666b9aa6d8af1c5419fa8c238e1f5e10e9ec33'
+            '9e3954c10f9dc11d3b6a6a0162061511eaa81b934debaf4f159f11f60e235e6f2762a216d10927695497e8cf7065855d343cd1573727da3f6355e669ea7c6788'
             'a248658d9466bd3aba854b429ce2c1981c5efff5196dead7b2a8c216b9a6cac781a9f487db5ff4513becc4e6d6cc14c494768a859e1f51a9eea848d8f0178204'
-            'fcff7163f6b979018ef4c09dc927ab8dc784b778d8a1bca6d986cc6797fa12f9b5cd902b344fd25c74ac13f71c022f515066d909d9b42e6c3be0ff214f1c7ca8')
+            'fcff7163f6b979018ef4c09dc927ab8dc784b778d8a1bca6d986cc6797fa12f9b5cd902b344fd25c74ac13f71c022f515066d909d9b42e6c3be0ff214f1c7ca8'
+            '3125df6b51cc835c22733f187e3d3f85ee7016d3b1c254ee1fae339c493a988c0220ce3fbd473ac54f6983460dd0b0bc38fca2ee8e007d22b4e24c7f2539069f')
 
 prepare() {
+  # https://github.com/tensorflow/tensorflow/pull/21017
+  patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/21017.patch
   # https://github.com/tensorflow/tensorflow/issues/20517
-  patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/update-cython.patch
   patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/python37.patch
   # https://github.com/tensorflow/tensorflow/issues/20950
-  patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/update-protobuf.patch
   patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/protobuf-python37-apply.patch
   cp ${srcdir}/protobuf-python37.patch tensorflow-${_pkgver}/third_party/
 
@@ -45,6 +43,7 @@
   export TF_NEED_JEMALLOC=1
   export TF_NEED_KAFKA=0
   export TF_NEED_OPENCL_SYCL=0
+  export TF_NEED_AWS=0
   export TF_NEED_GCP=0
   export TF_NEED_HDFS=0
   export TF_NEED_S3=0

Modified: python37.patch
===================================================================
--- python37.patch	2018-08-13 16:58:21 UTC (rev 371309)
+++ python37.patch	2018-08-13 17:06:48 UTC (rev 371310)
@@ -1,5 +1,5 @@
 diff --git a/tensorflow/c/eager/c_api.h b/tensorflow/c/eager/c_api.h
-index 1862af3ce2..093b97110f 100644
+index fdbd5374b2..4dfcaf8100 100644
 --- a/tensorflow/c/eager/c_api.h
 +++ b/tensorflow/c/eager/c_api.h
 @@ -76,7 +76,7 @@ typedef enum TFE_ContextDevicePlacementPolicy {
@@ -21,10 +21,19 @@
  
  // Causes the calling thread to block till all ops dispatched in async mode
 diff --git a/tensorflow/python/eager/pywrap_tfe_src.cc b/tensorflow/python/eager/pywrap_tfe_src.cc
-index 6c9481c3af..13edbb07db 100644
+index ec7e2371e9..fe1a3bed84 100644
 --- a/tensorflow/python/eager/pywrap_tfe_src.cc
 +++ b/tensorflow/python/eager/pywrap_tfe_src.cc
-@@ -813,7 +813,7 @@ char* TFE_GetPythonString(PyObject* o) {
+@@ -216,7 +216,7 @@ bool ParseStringValue(const string& key, PyObject* py_value, TF_Status* status,
+ #if PY_MAJOR_VERSION >= 3
+   if (PyUnicode_Check(py_value)) {
+     Py_ssize_t size = 0;
+-    char* buf = PyUnicode_AsUTF8AndSize(py_value, &size);
++    const char* buf = PyUnicode_AsUTF8AndSize(py_value, &size);
+     if (buf == nullptr) return false;
+     *value = tensorflow::StringPiece(buf, size);
+     return true;
+@@ -831,7 +831,7 @@ char* TFE_GetPythonString(PyObject* o) {
    }
  #if PY_MAJOR_VERSION >= 3
    if (PyUnicode_Check(o)) {
@@ -34,7 +43,7 @@
  #endif
    return nullptr;
 diff --git a/tensorflow/python/lib/core/ndarray_tensor.cc b/tensorflow/python/lib/core/ndarray_tensor.cc
-index 9df38d464c..4150fbfdd4 100644
+index ec1ba7b8f7..2e09757ed6 100644
 --- a/tensorflow/python/lib/core/ndarray_tensor.cc
 +++ b/tensorflow/python/lib/core/ndarray_tensor.cc
 @@ -154,7 +154,7 @@ Status PyBytesArrayMap(PyArrayObject* array, F f) {
@@ -47,10 +56,10 @@
          return errors::Internal("Unable to get element as UTF-8.");
        }
 diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
-index 30c1a9c759..231a66de59 100644
+index 57139986af..9b198e22da 100644
 --- a/tensorflow/python/lib/core/py_func.cc
 +++ b/tensorflow/python/lib/core/py_func.cc
-@@ -322,7 +322,7 @@ Status ConvertNdarrayToTensor(PyObject* obj, Tensor* ret) {
+@@ -352,7 +352,7 @@ Status ConvertNdarrayToTensor(PyObject* obj, Tensor* ret) {
          Py_ssize_t el_size;
          if (PyBytes_AsStringAndSize(input_data[i], &el, &el_size) == -1) {
  #if PY_MAJOR_VERSION >= 3



More information about the arch-commits mailing list