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

[Sven-Hendrik Haase]

    Date: Sunday, January 28, 2018 @ 14:58:51
  Author: svenstaro
Revision: 287617

upgpkg: tensorflow 1.5.0-1

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

-------------+
 15229.patch |   37 +++++++++++++++++++++++++++++++++++++
 PKGBUILD    |   17 ++++++++++++-----
 2 files changed, 49 insertions(+), 5 deletions(-)

Added: 15229.patch
===================================================================
--- 15229.patch	                        (rev 0)
+++ 15229.patch	2018-01-28 14:58:51 UTC (rev 287617)
@@ -0,0 +1,37 @@
+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-01-28 14:46:20 UTC (rev 287616)
+++ PKGBUILD	2018-01-28 14:58:51 UTC (rev 287617)
@@ -14,13 +14,18 @@
 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")
-sha512sums=('63240d72b9946db29279800b1081adc4cc08b6cd7dc35155a529cc335bfc1dd16fb525fb6047f6cc0dcec547a54e7e100698a176ee93f5633965cfab2a8ad9eb')
+source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
+        15229.patch)
+sha512sums=('63240d72b9946db29279800b1081adc4cc08b6cd7dc35155a529cc335bfc1dd16fb525fb6047f6cc0dcec547a54e7e100698a176ee93f5633965cfab2a8ad9eb'
+            '3fa052354c1b351430c2a36fa152b50802d8b46a5b22fbf427ba2589932e1ad83ee51f4e1ab1d641b1755ded46b5201f5e0d26b382e2aca72baa63567356a85f')
 
 prepare() {
-  # Trick tensorflow into not building Android
-  echo "android_sdk_repository" > tensorflow-${_pkgver}/WORKSPACE
+  # Trick tensorflow into not building Android. The env var
+  # 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
@@ -37,6 +42,8 @@
   export TF_NEED_VERBS=0
   export TF_NEED_OPENCL=0
   export TF_NEED_MPI=0
+  # This should work, but doesn't:
+  # export TF_SET_ANDROID_WORKSPACE=0
 }
 
 build() {
@@ -45,7 +52,7 @@
   export CC_OPT_FLAGS="-march=x86-64"
   export TF_NEED_CUDA=0
   ./configure
-  bazel build --config=opt //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package# ${_bazel_09_fix}
+  bazel build --config=opt //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package # ${_bazel_09_fix}
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmp
 
   cd ${srcdir}/tensorflow-${_pkgver}-cuda