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

[Sven-Hendrik Haase]

    Date: Monday, May 7, 2018 @ 10:52:40
  Author: svenstaro
Revision: 319090

upgpkg: tensorflow 1.8.0-1

Modified:
  tensorflow/trunk/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-07 09:54:32 UTC (rev 319089)
+++ PKGBUILD	2018-05-07 10:52:40 UTC (rev 319090)
@@ -4,24 +4,20 @@
 
 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.7.0
-_pkgver=1.7.0
-pkgrel=3
+pkgver=1.8.0
+_pkgver=1.8.0
+pkgrel=1
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
 arch=('x86_64')
-makedepends=('bazel' 'python-numpy' 'gcc6' 'cuda' 'nvidia-utils'
+makedepends=('bazel' 'python-numpy' '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"
-        17508.patch)
-sha512sums=('6b15f628a5788d8054406ee6a6d2dbb70dc891b76251513a67c71aae05e389e7213ac8a73daf393d2cc70a72b7dac43c9f43306e287ddfa2105dde863e3f45b6'
-            'cb2880767532275f55f91ab66b29687fceadcadb8e23608d1e59b35a2899239882367ac38465a5e635f17378286093da0ede115668e23d651776d962ddc35ea9')
+source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz")
+sha512sums=('7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d')
 
 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
@@ -41,22 +37,22 @@
   export TF_NEED_MPI=0
   export TF_NEED_TENSORRT=0
   export TF_SET_ANDROID_WORKSPACE=0
+  export TF_DOWNLOAD_CLANG=0
+  export TF_NCCL_VERSION=1.3  # configure.py: _DEFAULT_NCCL_VERSION
 }
 
 build() {
-  # _bazel_09_fix="--incompatible_load_argument_is_label=false"
   cd ${srcdir}/tensorflow-${_pkgver}
   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-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmp
 
   cd ${srcdir}/tensorflow-${_pkgver}-cuda
   export CC_OPT_FLAGS="-march=x86-64"
   export TF_NEED_CUDA=1
-  # For next version instead of the gcc-6 stuff:
-  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-6
+  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-5
   export TF_CUDA_CLANG=0
   # export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
   export CUDA_TOOLKIT_PATH=/opt/cuda
@@ -65,7 +61,7 @@
   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,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 build --cxxopt="-I/opt/cuda/include/crt" --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpcuda
 
   cd ${srcdir}/tensorflow-${_pkgver}-opt
@@ -72,14 +68,13 @@
   export CC_OPT_FLAGS="-march=haswell"
   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-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpopt
 
   cd ${srcdir}/tensorflow-${_pkgver}-opt-cuda
   export CC_OPT_FLAGS="-march=haswell"
   export TF_NEED_CUDA=1
-  # For next version instead of the gcc-6 stuff:
-  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-6
+  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-5
   export TF_CUDA_CLANG=0
   # export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
   export CUDA_TOOLKIT_PATH=/opt/cuda
@@ -88,7 +83,7 @@
   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,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 build --cxxopt="-I/opt/cuda/include/crt" --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package
   bazel-bin/tensorflow/tools/pip_package/build_pip_package ${srcdir}/tmpcudaopt
 }