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

[Sven-Hendrik Haase]

    Date: Sunday, January 27, 2019 @ 17:14:46
  Author: svenstaro
Revision: 428243

upgpkg: tensorflow 1.12.0-6

Install headers and add some CUDA archs

Modified:
  tensorflow/trunk/PKGBUILD

----------+
 PKGBUILD |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-27 16:59:58 UTC (rev 428242)
+++ PKGBUILD	2019-01-27 17:14:46 UTC (rev 428243)
@@ -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.12.0
 _pkgver=1.12.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -36,8 +36,6 @@
 
 prepare() {
   patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch
-  # https://github.com/tensorflow/tensorflow/issues/20517
-  # patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/python37.patch
   # https://github.com/tensorflow/tensorflow/issues/20950
   patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/protobuf-version-bump.patch
   patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/protobuf-python37-apply.patch
@@ -81,7 +79,12 @@
   export CC_OPT_FLAGS="-march=x86-64"
   export TF_NEED_CUDA=0
   ./configure
-  "${srcdir}"/bazel-0.19.2-linux-x86_64 build --config=opt //tensorflow:libtensorflow.so //tensorflow:libtensorflow_cc.so //tensorflow/tools/pip_package:build_pip_package
+  "${srcdir}"/bazel-0.19.2-linux-x86_64 \
+    build --config=opt \
+      //tensorflow:libtensorflow.so \
+      //tensorflow:libtensorflow_cc.so \
+      //tensorflow:install_headers \
+      //tensorflow/tools/pip_package:build_pip_package
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmp
 
   cd ${srcdir}/tensorflow-${_pkgver}-cuda
@@ -94,9 +97,14 @@
   export TF_CUDA_VERSION=$($CUDA_TOOLKIT_PATH/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
   export CUDNN_INSTALL_PATH=/usr/lib
   export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' /usr/include/cudnn.h)
-  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1,6.2,7.0,7.2,7.5
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.2,3.5,3.7,5.0,5.2,5.3,6.0,6.1,6.2,7.0,7.2,7.5
   ./configure
-  "${srcdir}"/bazel-0.19.2-linux-x86_64 build --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow:libtensorflow_cc.so //tensorflow/tools/pip_package:build_pip_package
+  "${srcdir}"/bazel-0.19.2-linux-x86_64 \
+    build --config=opt --config=opt \
+      //tensorflow:libtensorflow.so \
+      //tensorflow:libtensorflow_cc.so \
+      //tensorflow:install_headers \
+      //tensorflow/tools/pip_package:build_pip_package
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpcuda
 
   cd ${srcdir}/tensorflow-${_pkgver}-opt
@@ -103,7 +111,12 @@
   export CC_OPT_FLAGS="-march=haswell"
   export TF_NEED_CUDA=0
   ./configure
-  "${srcdir}"/bazel-0.19.2-linux-x86_64 build --config=opt //tensorflow:libtensorflow.so //tensorflow:libtensorflow_cc.so //tensorflow/tools/pip_package:build_pip_package
+  "${srcdir}"/bazel-0.19.2-linux-x86_64 \
+    build --config=opt \
+      //tensorflow:libtensorflow.so \
+      //tensorflow:libtensorflow_cc.so \
+      //tensorflow:install_headers \
+      //tensorflow/tools/pip_package:build_pip_package
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpopt
 
   cd ${srcdir}/tensorflow-${_pkgver}-opt-cuda
@@ -116,9 +129,14 @@
   export TF_CUDA_VERSION=$($CUDA_TOOLKIT_PATH/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
   export CUDNN_INSTALL_PATH=/usr/lib
   export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' /usr/include/cudnn.h)
-  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.1,6.2,7.0,7.2,7.5
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.2,3.5,3.7,5.0,5.2,5.3,6.0,6.1,6.2,7.0,7.2,7.5
   ./configure
-  "${srcdir}"/bazel-0.19.2-linux-x86_64 build --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow:libtensorflow_cc.so //tensorflow/tools/pip_package:build_pip_package
+  "${srcdir}"/bazel-0.19.2-linux-x86_64 \
+    build --config=opt --config=opt \
+      //tensorflow:libtensorflow.so \
+      //tensorflow:libtensorflow_cc.so \
+      //tensorflow:install_headers \
+      //tensorflow/tools/pip_package:build_pip_package
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpcudaopt
 }
 
@@ -132,6 +150,9 @@
   install -Dm755 bazel-bin/tensorflow/libtensorflow_framework.so ${pkgdir}/usr/lib/libtensorflow_framework.so
   install -Dm644 tensorflow/c/c_api.h ${pkgdir}/usr/include/tensorflow/c/c_api.h
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  mkdir -p ${pkgdir}/usr/include/tensorflow/
+  cp -r bazel-genfiles/tensorflow/include/tensorflow ${pkgdir}/usr/include/
 }
 
 package_tensorflow-opt() {
@@ -148,6 +169,9 @@
   install -Dm755 bazel-bin/tensorflow/libtensorflow_framework.so ${pkgdir}/usr/lib/libtensorflow_framework.so
   install -Dm644 tensorflow/c/c_api.h ${pkgdir}/usr/include/tensorflow/c/c_api.h
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  mkdir -p ${pkgdir}/usr/include/tensorflow/
+  cp -r bazel-genfiles/tensorflow/include/tensorflow ${pkgdir}/usr/include/
 }
 
 package_tensorflow-cuda() {
@@ -165,6 +189,9 @@
   install -Dm755 bazel-bin/tensorflow/libtensorflow_framework.so ${pkgdir}/usr/lib/libtensorflow_framework.so
   install -Dm644 tensorflow/c/c_api.h ${pkgdir}/usr/include/tensorflow/c/c_api.h
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  mkdir -p ${pkgdir}/usr/include/tensorflow/
+  cp -r bazel-genfiles/tensorflow/include/tensorflow ${pkgdir}/usr/include/
 }
 
 package_tensorflow-opt-cuda() {
@@ -182,6 +209,9 @@
   install -Dm755 bazel-bin/tensorflow/libtensorflow_framework.so ${pkgdir}/usr/lib/libtensorflow_framework.so
   install -Dm644 tensorflow/c/c_api.h ${pkgdir}/usr/include/tensorflow/c/c_api.h
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  mkdir -p ${pkgdir}/usr/include/tensorflow/
+  cp -r bazel-genfiles/tensorflow/include/tensorflow ${pkgdir}/usr/include/
 }
 
 package_python-tensorflow() {