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

[Sven-Hendrik Haase]

    Date: Tuesday, March 6, 2018 @ 22:08:33
  Author: svenstaro
Revision: 303331

upgpkg: tensorflow 1.6.0-1

Modified:
  tensorflow/trunk/PKGBUILD
Deleted:
  tensorflow/trunk/15229.patch

-------------+
 15229.patch |   37 -------------------------------------
 PKGBUILD    |   16 +++++++---------
 2 files changed, 7 insertions(+), 46 deletions(-)

Deleted: 15229.patch
===================================================================
--- 15229.patch	2018-03-06 22:06:09 UTC (rev 303330)
+++ 15229.patch	2018-03-06 22:08:33 UTC (rev 303331)
@@ -1,37 +0,0 @@
-From d4c33cfc944cbcac7a31811ba8f86448d8cc2e23 Mon Sep 17 00:00:00 2001
-From: Anush Elangovan <anush at nod-labs.com>
-Date: Fri, 8 Dec 2017 20:48:23 -0800
-Subject: [PATCH] [XLA] Fix XLA/tfcompile compile error on OSX
-
-This fixes issue #15196
-
-kernel_support_library.cc:99:5: error: no matching function
-for call to 'transform' std::transform(function->arg_begin(),..
-
-TEST=build tfcompile on OSX (also requires PR#14893)
----
- .../compiler/xla/service/llvm_ir/kernel_support_library.cc    | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tensorflow/compiler/xla/service/llvm_ir/kernel_support_library.cc b/tensorflow/compiler/xla/service/llvm_ir/kernel_support_library.cc
-index 5f6f9810c3a..23d2d4e87d2 100644
---- a/tensorflow/compiler/xla/service/llvm_ir/kernel_support_library.cc
-+++ b/tensorflow/compiler/xla/service/llvm_ir/kernel_support_library.cc
-@@ -111,8 +111,15 @@ void KernelSupportLibrary::EmitAndCallOutlinedKernel(
-     ir_builder->SetInsertPoint(return_inst);
- 
-     std::vector<llvm::Value*> arg_values;
--    std::transform(function->arg_begin(), function->arg_end(),
--                   std::back_inserter(arg_values), std::addressof<llvm::Value>);
-+    /*
-+     * clang on OSX doesn't like std::transform or range for loop here.
-+     * See https://github.com/tensorflow/tensorflow/issues/15196
-+     */
-+    for (llvm::Function::arg_iterator arg = function->arg_begin(),
-+                                      arg_e = function->arg_end();
-+         arg != arg_e; ++arg) {
-+      arg_values.push_back(arg);
-+    }
-     if (null_arg_idx != -1) {
-       arg_values.insert(arg_values.begin() + null_arg_idx, nullptr);
-     }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-06 22:06:09 UTC (rev 303330)
+++ PKGBUILD	2018-03-06 22:08:33 UTC (rev 303331)
@@ -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.5.0
-_pkgver=1.5.0
-pkgrel=2
+pkgver=1.6.0
+_pkgver=1.6.0
+pkgrel=1
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -14,10 +14,8 @@
 makedepends=('bazel' 'python-numpy' 'gcc6' 'cuda' 'nvidia-utils'
              'cudnn' 'python-pip' 'python-wheel' 'python-setuptools')
 optdepends=('tensorboard: Tensorflow visualization toolkit')
-source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
-        15229.patch)
-sha512sums=('63240d72b9946db29279800b1081adc4cc08b6cd7dc35155a529cc335bfc1dd16fb525fb6047f6cc0dcec547a54e7e100698a176ee93f5633965cfab2a8ad9eb'
-            '3fa052354c1b351430c2a36fa152b50802d8b46a5b22fbf427ba2589932e1ad83ee51f4e1ab1d641b1755ded46b5201f5e0d26b382e2aca72baa63567356a85f')
+source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz")
+sha512sums=('a3e5f07c8f622e952f522baf78d943cf484d8b9a2e77857e2ddb33289ca9e60cb80835dce1e9366b9eedda6beb9dc0043a8e26e02b738bc71bcbf24ae3030c7e')
 
 prepare() {
   # Trick tensorflow into not building Android. The env var
@@ -24,8 +22,6 @@
   # TF_SET_ANDROID_WORKSPACE does not work for some reason.
   sed -i "s/if workspace_has_any_android_rule()/if True/g" tensorflow-${_pkgver}/configure.py
 
-  patch -Np1 -d tensorflow-${_pkgver} -i ${srcdir}/15229.patch
-
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-cuda
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt-cuda
@@ -33,6 +29,7 @@
   export PYTHON_BIN_PATH=/usr/bin/python
   export USE_DEFAULT_PYTHON_LIB_PATH=1
   export TF_NEED_JEMALLOC=1
+  export TF_NEED_KAFKA=0
   export TF_NEED_OPENCL_SYCL=0
   export TF_NEED_GCP=0
   export TF_NEED_HDFS=0
@@ -42,6 +39,7 @@
   export TF_NEED_VERBS=0
   export TF_NEED_OPENCL=0
   export TF_NEED_MPI=0
+  export TF_NEED_TENSORRT=0
   # This should work, but doesn't:
   # export TF_SET_ANDROID_WORKSPACE=0
 }