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

[Sven-Hendrik Haase]

    Date: Friday, April 20, 2018 @ 21:55:24
  Author: svenstaro
Revision: 317225

upgpkg: tensorflow 1.7.0-3

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

-------------+
 17508.patch |   28 ++++++++++++++++++++++++++++
 PKGBUILD    |   14 +++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)

Added: 17508.patch
===================================================================
--- 17508.patch	                        (rev 0)
+++ 17508.patch	2018-04-20 21:55:24 UTC (rev 317225)
@@ -0,0 +1,28 @@
+From 340327dc8cc637fef01e66f7dd7cae68ce259b94 Mon Sep 17 00:00:00 2001
+From: Yun Peng <pcloudy at google.com>
+Date: Wed, 7 Mar 2018 13:50:31 +0100
+Subject: [PATCH] jpeg.BUILD: Using --cpu instead of --android_cpu
+
+---
+ third_party/jpeg/jpeg.BUILD | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/jpeg/jpeg.BUILD b/third_party/jpeg/jpeg.BUILD
+index 87a23925c43..4418ac32fc4 100644
+--- a/third_party/jpeg/jpeg.BUILD
++++ b/third_party/jpeg/jpeg.BUILD
+@@ -526,12 +526,12 @@ config_setting(
+ 
+ config_setting(
+     name = "armeabi-v7a",
+-    values = {"android_cpu": "armeabi-v7a"},
++    values = {"cpu": "armeabi-v7a"},
+ )
+ 
+ config_setting(
+     name = "arm64-v8a",
+-    values = {"android_cpu": "arm64-v8a"},
++    values = {"cpu": "arm64-v8a"},
+ )
+ 
+ config_setting(

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-20 21:09:28 UTC (rev 317224)
+++ PKGBUILD	2018-04-20 21:55:24 UTC (rev 317225)
@@ -6,7 +6,7 @@
 pkgname=(tensorflow tensorflow-opt tensorflow-cuda tensorflow-opt-cuda python-tensorflow python-tensorflow-opt python-tensorflow-cuda python-tensorflow-opt-cuda)
 pkgver=1.7.0
 _pkgver=1.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -14,10 +14,14 @@
 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=('6b15f628a5788d8054406ee6a6d2dbb70dc891b76251513a67c71aae05e389e7213ac8a73daf393d2cc70a72b7dac43c9f43306e287ddfa2105dde863e3f45b6')
+source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz"
+        17508.patch)
+sha512sums=('6b15f628a5788d8054406ee6a6d2dbb70dc891b76251513a67c71aae05e389e7213ac8a73daf393d2cc70a72b7dac43c9f43306e287ddfa2105dde863e3f45b6'
+            'cb2880767532275f55f91ab66b29687fceadcadb8e23608d1e59b35a2899239882367ac38465a5e635f17378286093da0ede115668e23d651776d962ddc35ea9')
 
 prepare() {
+  patch -Np1 -i ${srcdir}/17508.patch -d tensorflow-${_pkgver}
+
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-cuda
   cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt-cuda
@@ -59,7 +63,7 @@
   export TF_CUDA_VERSION=$($CUDA_TOOLKIT_PATH/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
   export CUDNN_INSTALL_PATH=/opt/cuda
   export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' $CUDNN_INSTALL_PATH/include/cudnn.h)
-  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1,6.2
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1,6.2,7.0
   ./configure
   bazel build --cxxopt="-I/opt/cuda/include/crt" --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package ${_bazel_09_fix}
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpcuda
@@ -82,7 +86,7 @@
   export TF_CUDA_VERSION=$($CUDA_TOOLKIT_PATH/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
   export CUDNN_INSTALL_PATH=/opt/cuda
   export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' $CUDNN_INSTALL_PATH/include/cudnn.h)
-  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1,6.2
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1,6.2,7.0
   ./configure
   bazel build --cxxopt="-I/opt/cuda/include/crt" --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package ${_bazel_09_fix}
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpcudaopt