[arch-commits] Commit in tensorflow/repos/community-x86_64 (8 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Sun Jun 23 23:19:56 UTC 2019


    Date: Sunday, June 23, 2019 @ 23:19:55
  Author: svenstaro
Revision: 483354

archrelease: copy trunk to community-x86_64

Added:
  tensorflow/repos/community-x86_64/PKGBUILD
    (from rev 483353, tensorflow/trunk/PKGBUILD)
  tensorflow/repos/community-x86_64/cuda_config.patch
    (from rev 483353, tensorflow/trunk/cuda_config.patch)
  tensorflow/repos/community-x86_64/protobuf_temp_fix_cuda10.1.patch
    (from rev 483353, tensorflow/trunk/protobuf_temp_fix_cuda10.1.patch)
  tensorflow/repos/community-x86_64/protobuf_temp_fix_cuda10.1_apply.patch
    (from rev 483353, tensorflow/trunk/protobuf_temp_fix_cuda10.1_apply.patch)
Deleted:
  tensorflow/repos/community-x86_64/PKGBUILD
  tensorflow/repos/community-x86_64/cuda_config.patch
  tensorflow/repos/community-x86_64/protobuf_temp_fix_cuda10.1.patch
  tensorflow/repos/community-x86_64/protobuf_temp_fix_cuda10.1_apply.patch

----------------------------------------+
 PKGBUILD                               |  482 +++++++++++++++----------------
 cuda_config.patch                      |  140 ++++-----
 protobuf_temp_fix_cuda10.1.patch       |   70 ++--
 protobuf_temp_fix_cuda10.1_apply.patch |   88 ++---
 4 files changed, 390 insertions(+), 390 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-23 23:19:37 UTC (rev 483353)
+++ PKGBUILD	2019-06-23 23:19:55 UTC (rev 483354)
@@ -1,241 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Co-Maintainer: Konstantin Gizdov (kgizdov) <arch at kge.pw>
-# Contributor: Adria Arrufat (archdria) <adria.arrufat+AUR at protonmail.ch>
-# Contributor: Thibault Lorrain (fredszaq) <fredszaq at gmail.com>
-
-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.14.0rc1
-_pkgver=1.14.0-rc1
-pkgrel=2
-pkgdesc="Library for computation using data flow graphs for scalable machine learning"
-url="https://www.tensorflow.org/"
-license=('APACHE')
-arch=('x86_64')
-depends=('c-ares')
-makedepends=('bazel' 'python-numpy' 'cuda' 'nvidia-utils' 'nccl' 'git' 'gcc'
-             'cudnn' 'python-pip' 'python-wheel' 'python-setuptools' 'python-h5py'
-             'python-keras-applications' 'python-keras-preprocessing')
-optdepends=('tensorboard: Tensorflow visualization toolkit')
-source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz")
-sha512sums=('c2d24332b05719bae4ca35f52ccbcc973a899e7abd7ebe8372a6c352bc254d05a489bd92b3d80c7c4a0ea640bd5295a3ec084cf85de431ab4e655c2d916ae10f')
-
-get_pyver () {
-    python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
-}
-
-prepare() {
-  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt
-  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-cuda
-  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt-cuda
-
-  # These environment variables influence the behavior of the configure call below.
-  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_AWS=0
-  export TF_NEED_GCP=0
-  export TF_NEED_HDFS=0
-  export TF_NEED_S3=0
-  export TF_ENABLE_XLA=1
-  export TF_NEED_GDR=0
-  export TF_NEED_VERBS=0
-  export TF_NEED_OPENCL=0
-  export TF_NEED_MPI=0
-  export TF_NEED_TENSORRT=0
-  export TF_NEED_NGRAPH=0
-  export TF_NEED_IGNITE=0
-  export TF_NEED_ROCM=0
-  export TF_SET_ANDROID_WORKSPACE=0
-  export TF_DOWNLOAD_CLANG=0
-  export TF_NCCL_VERSION=2.4
-  export TF_IGNORE_MAX_BAZEL_VERSION=1
-  export NCCL_INSTALL_PATH=/usr
-  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc
-  export HOST_CXX_COMPILER_PATH=/usr/bin/gcc
-  export TF_CUDA_CLANG=0  # Clang currently disabled because it's not compatible at the moment.
-  export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
-  export TF_CUDA_PATHS=/opt/cuda,/usr/lib,/usr
-  export TF_CUDA_VERSION=$(/opt/cuda/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
-  export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' /usr/include/cudnn.h)
-  export TF_CUDA_COMPUTE_CAPABILITIES=3.5,3.7,5.0,5.2,5.3,6.0,6.1,6.2,7.0,7.2,7.5
-}
-
-build() {
-  echo "Building without cuda and without non-x86-64 optimizations"
-  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:libtensorflow_cc.so \
-      //tensorflow:install_headers \
-      //tensorflow/tools/pip_package:build_pip_package
-  bazel-bin/tensorflow/tools/pip_package/build_pip_package "${srcdir}"/tmp
-
-
-  echo "Building without cuda and with non-x86-64 optimizations"
-  cd "${srcdir}"/tensorflow-${_pkgver}-opt
-  export CC_OPT_FLAGS="-march=haswell"
-  export TF_NEED_CUDA=0
-  ./configure
-  bazel \
-    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
-
-
-  echo "Building with cuda and without non-x86-64 optimizations"
-  cd "${srcdir}"/tensorflow-${_pkgver}-cuda
-  export CC_OPT_FLAGS="-march=x86-64"
-  export TF_NEED_CUDA=1
-  ./configure
-  bazel \
-    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}"/tmpcuda
-
-
-  echo "Building with cuda and without non-x86-64 optimizations"
-  cd "${srcdir}"/tensorflow-${_pkgver}-opt-cuda
-  export CC_OPT_FLAGS="-march=haswell"
-  export TF_NEED_CUDA=1
-  export TF_CUDA_CLANG=0
-  ./configure
-  bazel \
-    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}"/tmpoptcuda
-}
-
-_package() {
-  # install headers first
-  install -d "${pkgdir}"/usr/include/tensorflow
-  cp -r bazel-genfiles/tensorflow/include/* "${pkgdir}"/usr/include/tensorflow/
-  # install python-version to get all extra headers
-  WHEEL_PACKAGE=$(find "${srcdir}"/$1 -name "tensor*.whl")
-  pip install --ignore-installed --upgrade --root "${pkgdir}"/ $WHEEL_PACKAGE --no-dependencies
-  # move extra headers to correct location
-  find "${pkgdir}/usr/lib/python$(get_pyver)"/site-packages/tensorflow/include -maxdepth 1 -mindepth 1 -type d -print0 | while read -rd $'\0' _folder; do
-    cp -nr "${_folder}" "${pkgdir}"/usr/include/tensorflow/
-  done
-  # clean up unneeded files
-  rm -rf "${pkgdir}"/usr/bin
-  rm -rf "${pkgdir}"/usr/lib
-  rm -rf "${pkgdir}"/usr/share
-
-  # install the rest of tensorflow
-  tensorflow/c/generate-pc.sh --prefix=/usr --version=${pkgver}
-  sed -e 's/\/include/\/include\/tensorflow/' -i tensorflow.pc
-  install -Dm644 tensorflow.pc "${pkgdir}"/usr/lib/pkgconfig/tensorflow.pc
-  install -Dm755 bazel-bin/tensorflow/libtensorflow.so "${pkgdir}"/usr/lib/libtensorflow.so
-  install -Dm755 bazel-bin/tensorflow/libtensorflow_cc.so "${pkgdir}"/usr/lib/libtensorflow_cc.so
-  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/tensorflow/c/c_api.h
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-_python_package() {
-  WHEEL_PACKAGE=$(find "${srcdir}"/$1 -name "tensor*.whl")
-  pip install --ignore-installed --upgrade --root "${pkgdir}"/ $WHEEL_PACKAGE --no-dependencies
-
-  # create symlinks to headers
-  find "${pkgdir}/usr/lib/python$(get_pyver)"/site-packages/tensorflow/include/ -maxdepth 1 -mindepth 1 -type d -print0 | while read -rd $'\0' _folder; do
-    rm -rf "${_folder}"
-    _smlink="$(basename "${_folder}")"
-    ln -s /usr/include/tensorflow/"${_smlink}" "${pkgdir}/usr/lib/python$(get_pyver)"/site-packages/tensorflow/include/
-  done
-
-  # tensorboard has been separated from upstream but they still install it with
-  # tensorflow. I don't know what kind of sense that makes but we have to clean
-  # it out from this pacakge.
-  rm -rf "${pkgdir}"/usr/bin/tensorboard
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_tensorflow() {
-  cd "${srcdir}"/tensorflow-${_pkgver}
-  _package tmp
-}
-
-package_tensorflow-opt() {
-  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CPU optimizations)"
-  conflicts=(tensorflow)
-  provides=(tensorflow)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}-opt
-  _package tmpopt
-}
-
-package_tensorflow-cuda() {
-  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA)"
-  depends+=(cuda cudnn nccl)
-  conflicts=(tensorflow)
-  provides=(tensorflow)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}-cuda
-  _package tmpcuda
-}
-
-package_tensorflow-opt-cuda() {
-  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA and CPU optimizations)"
-  depends+=(cuda cudnn nccl)
-  conflicts=(tensorflow)
-  provides=(tensorflow tensorflow-cuda)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}-opt-cuda
-  _package tmpoptcuda
-}
-
-package_python-tensorflow() {
-  depends+=(tensorflow python-termcolor python-astor python-gast python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}
-  _python_package tmp
-}
-
-package_python-tensorflow-opt() {
-  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CPU optimizations)"
-  depends+=(tensorflow-opt python-termcolor python-astor python-gast python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
-  conflicts=(python-tensorflow)
-  provides=(python-tensorflow)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}-opt
-  _python_package tmpopt
-}
-
-package_python-tensorflow-cuda() {
-  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA)"
-  depends+=(tensorflow-cuda python-termcolor python-astor python-gast python-numpy cuda cudnn python-pycuda python-protobuf absl-py nccl python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
-  conflicts=(python-tensorflow)
-  provides=(python-tensorflow)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}-cuda
-  _python_package tmpcuda
-}
-
-package_python-tensorflow-opt-cuda() {
-  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA and CPU optimizations)"
-  depends+=(tensorflow-opt-cuda python-termcolor python-astor python-gast python-numpy cuda cudnn python-pycuda python-protobuf absl-py nccl python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
-  conflicts=(python-tensorflow)
-  provides=(python-tensorflow python-tensorflow-cuda)
-
-  cd "${srcdir}"/tensorflow-${_pkgver}-opt-cuda
-  _python_package tmpoptcuda
-}
-
-# vim:set ts=2 sw=2 et:

Copied: tensorflow/repos/community-x86_64/PKGBUILD (from rev 483353, tensorflow/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-23 23:19:55 UTC (rev 483354)
@@ -0,0 +1,241 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Co-Maintainer: Konstantin Gizdov (kgizdov) <arch at kge.pw>
+# Contributor: Adria Arrufat (archdria) <adria.arrufat+AUR at protonmail.ch>
+# Contributor: Thibault Lorrain (fredszaq) <fredszaq at gmail.com>
+
+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.14.0
+_pkgver=1.14.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')
+depends=('c-ares')
+makedepends=('bazel' 'python-numpy' 'cuda' 'nvidia-utils' 'nccl' 'git' 'gcc'
+             'cudnn' 'python-pip' 'python-wheel' 'python-setuptools' 'python-h5py'
+             'python-keras-applications' 'python-keras-preprocessing')
+optdepends=('tensorboard: Tensorflow visualization toolkit')
+source=("https://github.com/tensorflow/tensorflow/archive/v${_pkgver}.tar.gz")
+sha512sums=('ac9ea5a2d1c761aaafbdc335259e29c128127b8d069ec5b206067935180490aa95e93c7e13de57f7f54ce4ba4f34a822face22b4a028f60185edb380e5cd4787')
+
+get_pyver () {
+    python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
+}
+
+prepare() {
+  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt
+  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-cuda
+  cp -r tensorflow-${_pkgver} tensorflow-${_pkgver}-opt-cuda
+
+  # These environment variables influence the behavior of the configure call below.
+  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_AWS=0
+  export TF_NEED_GCP=0
+  export TF_NEED_HDFS=0
+  export TF_NEED_S3=0
+  export TF_ENABLE_XLA=1
+  export TF_NEED_GDR=0
+  export TF_NEED_VERBS=0
+  export TF_NEED_OPENCL=0
+  export TF_NEED_MPI=0
+  export TF_NEED_TENSORRT=0
+  export TF_NEED_NGRAPH=0
+  export TF_NEED_IGNITE=0
+  export TF_NEED_ROCM=0
+  export TF_SET_ANDROID_WORKSPACE=0
+  export TF_DOWNLOAD_CLANG=0
+  export TF_NCCL_VERSION=2.4
+  export TF_IGNORE_MAX_BAZEL_VERSION=1
+  export NCCL_INSTALL_PATH=/usr
+  export GCC_HOST_COMPILER_PATH=/usr/bin/gcc-8
+  export HOST_CXX_COMPILER_PATH=/usr/bin/gcc-8
+  export TF_CUDA_CLANG=0  # Clang currently disabled because it's not compatible at the moment.
+  export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
+  export TF_CUDA_PATHS=/opt/cuda,/usr/lib,/usr
+  export TF_CUDA_VERSION=$(/opt/cuda/bin/nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')
+  export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' /usr/include/cudnn.h)
+  export TF_CUDA_COMPUTE_CAPABILITIES=3.5,3.7,5.0,5.2,5.3,6.0,6.1,6.2,7.0,7.2,7.5
+}
+
+build() {
+  echo "Building without cuda and without non-x86-64 optimizations"
+  cd "${srcdir}"/tensorflow-${_pkgver}
+  export CC_OPT_FLAGS="-march=x86-64"
+  export TF_NEED_CUDA=0
+  ./configure
+  bazel \
+    build --config=opt --incompatible_no_support_tools_in_action_inputs=false \
+      //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
+
+
+  echo "Building without cuda and with non-x86-64 optimizations"
+  cd "${srcdir}"/tensorflow-${_pkgver}-opt
+  export CC_OPT_FLAGS="-march=haswell"
+  export TF_NEED_CUDA=0
+  ./configure
+  bazel \
+    build --config=opt --incompatible_no_support_tools_in_action_inputs=false \
+      //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
+
+
+  echo "Building with cuda and without non-x86-64 optimizations"
+  cd "${srcdir}"/tensorflow-${_pkgver}-cuda
+  export CC_OPT_FLAGS="-march=x86-64"
+  export TF_NEED_CUDA=1
+  ./configure
+  bazel \
+    build --config=opt --incompatible_no_support_tools_in_action_inputs=false \
+      //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
+
+
+  echo "Building with cuda and without non-x86-64 optimizations"
+  cd "${srcdir}"/tensorflow-${_pkgver}-opt-cuda
+  export CC_OPT_FLAGS="-march=haswell"
+  export TF_NEED_CUDA=1
+  export TF_CUDA_CLANG=0
+  ./configure
+  bazel \
+    build --config=opt --incompatible_no_support_tools_in_action_inputs=false \
+      //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}"/tmpoptcuda
+}
+
+_package() {
+  # install headers first
+  install -d "${pkgdir}"/usr/include/tensorflow
+  cp -r bazel-genfiles/tensorflow/include/* "${pkgdir}"/usr/include/tensorflow/
+  # install python-version to get all extra headers
+  WHEEL_PACKAGE=$(find "${srcdir}"/$1 -name "tensor*.whl")
+  pip install --ignore-installed --upgrade --root "${pkgdir}"/ $WHEEL_PACKAGE --no-dependencies
+  # move extra headers to correct location
+  find "${pkgdir}/usr/lib/python$(get_pyver)"/site-packages/tensorflow/include -maxdepth 1 -mindepth 1 -type d -print0 | while read -rd $'\0' _folder; do
+    cp -nr "${_folder}" "${pkgdir}"/usr/include/tensorflow/
+  done
+  # clean up unneeded files
+  rm -rf "${pkgdir}"/usr/bin
+  rm -rf "${pkgdir}"/usr/lib
+  rm -rf "${pkgdir}"/usr/share
+
+  # install the rest of tensorflow
+  tensorflow/c/generate-pc.sh --prefix=/usr --version=${pkgver}
+  sed -e 's/\/include/\/include\/tensorflow/' -i tensorflow.pc
+  install -Dm644 tensorflow.pc "${pkgdir}"/usr/lib/pkgconfig/tensorflow.pc
+  install -Dm755 bazel-bin/tensorflow/libtensorflow.so "${pkgdir}"/usr/lib/libtensorflow.so
+  install -Dm755 bazel-bin/tensorflow/libtensorflow_cc.so "${pkgdir}"/usr/lib/libtensorflow_cc.so
+  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/tensorflow/c/c_api.h
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+_python_package() {
+  WHEEL_PACKAGE=$(find "${srcdir}"/$1 -name "tensor*.whl")
+  pip install --ignore-installed --upgrade --root "${pkgdir}"/ $WHEEL_PACKAGE --no-dependencies
+
+  # create symlinks to headers
+  find "${pkgdir}/usr/lib/python$(get_pyver)"/site-packages/tensorflow/include/ -maxdepth 1 -mindepth 1 -type d -print0 | while read -rd $'\0' _folder; do
+    rm -rf "${_folder}"
+    _smlink="$(basename "${_folder}")"
+    ln -s /usr/include/tensorflow/"${_smlink}" "${pkgdir}/usr/lib/python$(get_pyver)"/site-packages/tensorflow/include/
+  done
+
+  # tensorboard has been separated from upstream but they still install it with
+  # tensorflow. I don't know what kind of sense that makes but we have to clean
+  # it out from this pacakge.
+  rm -rf "${pkgdir}"/usr/bin/tensorboard
+
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_tensorflow() {
+  cd "${srcdir}"/tensorflow-${_pkgver}
+  _package tmp
+}
+
+package_tensorflow-opt() {
+  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CPU optimizations)"
+  conflicts=(tensorflow)
+  provides=(tensorflow)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}-opt
+  _package tmpopt
+}
+
+package_tensorflow-cuda() {
+  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA)"
+  depends+=(cuda cudnn nccl)
+  conflicts=(tensorflow)
+  provides=(tensorflow)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}-cuda
+  _package tmpcuda
+}
+
+package_tensorflow-opt-cuda() {
+  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA and CPU optimizations)"
+  depends+=(cuda cudnn nccl)
+  conflicts=(tensorflow)
+  provides=(tensorflow tensorflow-cuda)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}-opt-cuda
+  _package tmpoptcuda
+}
+
+package_python-tensorflow() {
+  depends+=(tensorflow python-termcolor python-astor python-gast python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}
+  _python_package tmp
+}
+
+package_python-tensorflow-opt() {
+  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CPU optimizations)"
+  depends+=(tensorflow-opt python-termcolor python-astor python-gast python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
+  conflicts=(python-tensorflow)
+  provides=(python-tensorflow)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}-opt
+  _python_package tmpopt
+}
+
+package_python-tensorflow-cuda() {
+  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA)"
+  depends+=(tensorflow-cuda python-termcolor python-astor python-gast python-numpy cuda cudnn python-pycuda python-protobuf absl-py nccl python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
+  conflicts=(python-tensorflow)
+  provides=(python-tensorflow)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}-cuda
+  _python_package tmpcuda
+}
+
+package_python-tensorflow-opt-cuda() {
+  pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA and CPU optimizations)"
+  depends+=(tensorflow-opt-cuda python-termcolor python-astor python-gast python-numpy cuda cudnn python-pycuda python-protobuf absl-py nccl python-h5py python-keras-applications python-keras-preprocessing python-tensorflow-estimator)
+  conflicts=(python-tensorflow)
+  provides=(python-tensorflow python-tensorflow-cuda)
+
+  cd "${srcdir}"/tensorflow-${_pkgver}-opt-cuda
+  _python_package tmpoptcuda
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: cuda_config.patch
===================================================================
--- cuda_config.patch	2019-06-23 23:19:37 UTC (rev 483353)
+++ cuda_config.patch	2019-06-23 23:19:55 UTC (rev 483354)
@@ -1,70 +0,0 @@
-diff --git a/tensorflow/stream_executor/dso_loader.cc b/tensorflow/stream_executor/dso_loader.cc
-index 6dda5d6315..4df1d0dcfc 100644
---- a/tensorflow/stream_executor/dso_loader.cc
-+++ b/tensorflow/stream_executor/dso_loader.cc
-@@ -46,7 +46,7 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
- 
- /* static */ port::Status DsoLoader::GetCublasDsoHandle(void** dso_handle) {
-   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
--                                      "cublas", GetCudaVersion()),
-+                                      "cublas", "10"),
-                                   GetCudaLibraryDirPath()),
-                       dso_handle);
- }
-@@ -63,14 +63,14 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
- 
- /* static */ port::Status DsoLoader::GetCufftDsoHandle(void** dso_handle) {
-   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
--                                      "cufft", GetCudaVersion()),
-+                                      "cufft", "10"),
-                                   GetCudaLibraryDirPath()),
-                       dso_handle);
- }
- 
- /* static */ port::Status DsoLoader::GetCurandDsoHandle(void** dso_handle) {
-   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
--                                      "curand", GetCudaVersion()),
-+                                      "curand", "10"),
-                                   GetCudaLibraryDirPath()),
-                       dso_handle);
- }
-diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
-index 8aa5b89cdd..7ed4bb8b45 100644
---- a/third_party/gpus/cuda_configure.bzl
-+++ b/third_party/gpus/cuda_configure.bzl
-@@ -842,7 +842,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "cusolver":
-           _find_cuda_lib(
-@@ -850,7 +850,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "curand":
-           _find_cuda_lib(
-@@ -858,7 +858,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "cufft":
-           _find_cuda_lib(
-@@ -866,7 +866,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "cudnn":
-           _find_cuda_lib(

Copied: tensorflow/repos/community-x86_64/cuda_config.patch (from rev 483353, tensorflow/trunk/cuda_config.patch)
===================================================================
--- cuda_config.patch	                        (rev 0)
+++ cuda_config.patch	2019-06-23 23:19:55 UTC (rev 483354)
@@ -0,0 +1,70 @@
+diff --git a/tensorflow/stream_executor/dso_loader.cc b/tensorflow/stream_executor/dso_loader.cc
+index 6dda5d6315..4df1d0dcfc 100644
+--- a/tensorflow/stream_executor/dso_loader.cc
++++ b/tensorflow/stream_executor/dso_loader.cc
+@@ -46,7 +46,7 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
+ 
+ /* static */ port::Status DsoLoader::GetCublasDsoHandle(void** dso_handle) {
+   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
+-                                      "cublas", GetCudaVersion()),
++                                      "cublas", "10"),
+                                   GetCudaLibraryDirPath()),
+                       dso_handle);
+ }
+@@ -63,14 +63,14 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
+ 
+ /* static */ port::Status DsoLoader::GetCufftDsoHandle(void** dso_handle) {
+   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
+-                                      "cufft", GetCudaVersion()),
++                                      "cufft", "10"),
+                                   GetCudaLibraryDirPath()),
+                       dso_handle);
+ }
+ 
+ /* static */ port::Status DsoLoader::GetCurandDsoHandle(void** dso_handle) {
+   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
+-                                      "curand", GetCudaVersion()),
++                                      "curand", "10"),
+                                   GetCudaLibraryDirPath()),
+                       dso_handle);
+ }
+diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
+index 8aa5b89cdd..7ed4bb8b45 100644
+--- a/third_party/gpus/cuda_configure.bzl
++++ b/third_party/gpus/cuda_configure.bzl
+@@ -842,7 +842,7 @@ def _find_libs(repository_ctx, cuda_config):
+               repository_ctx,
+               cpu_value,
+               cuda_config.cuda_toolkit_path,
+-              cuda_config.cuda_version,
++              '',
+           ),
+       "cusolver":
+           _find_cuda_lib(
+@@ -850,7 +850,7 @@ def _find_libs(repository_ctx, cuda_config):
+               repository_ctx,
+               cpu_value,
+               cuda_config.cuda_toolkit_path,
+-              cuda_config.cuda_version,
++              '',
+           ),
+       "curand":
+           _find_cuda_lib(
+@@ -858,7 +858,7 @@ def _find_libs(repository_ctx, cuda_config):
+               repository_ctx,
+               cpu_value,
+               cuda_config.cuda_toolkit_path,
+-              cuda_config.cuda_version,
++              '',
+           ),
+       "cufft":
+           _find_cuda_lib(
+@@ -866,7 +866,7 @@ def _find_libs(repository_ctx, cuda_config):
+               repository_ctx,
+               cpu_value,
+               cuda_config.cuda_toolkit_path,
+-              cuda_config.cuda_version,
++              '',
+           ),
+       "cudnn":
+           _find_cuda_lib(

Deleted: protobuf_temp_fix_cuda10.1.patch
===================================================================
--- protobuf_temp_fix_cuda10.1.patch	2019-06-23 23:19:37 UTC (rev 483353)
+++ protobuf_temp_fix_cuda10.1.patch	2019-06-23 23:19:55 UTC (rev 483354)
@@ -1,35 +0,0 @@
-diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
-index 40f35e92..1af91f9c 100644
---- a/src/google/protobuf/map.h
-+++ b/src/google/protobuf/map.h
-@@ -425,10 +425,10 @@ class Map {
-         node_ = NULL;
-         for (bucket_index_ = start_bucket; bucket_index_ < m_->num_buckets_;
-              bucket_index_++) {
--          if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
-+          if ((*m_).TableEntryIsNonEmptyList(bucket_index_)) {
-             node_ = static_cast<Node*>(m_->table_[bucket_index_]);
-             break;
--          } else if (m_->TableEntryIsTree(bucket_index_)) {
-+          } else if ((*m_).TableEntryIsTree(bucket_index_)) {
-             Tree* tree = static_cast<Tree*>(m_->table_[bucket_index_]);
-             GOOGLE_DCHECK(!tree->empty());
-             node_ = NodePtrFromKeyPtr(*tree->begin());
-@@ -487,7 +487,7 @@ class Map {
-           return true;
-         // Less common: the bucket is a linked list with node_ somewhere in it,
-         // but not at the head.
--        if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
-+        if ((*m_).TableEntryIsNonEmptyList(bucket_index_)) {
-           Node* l = static_cast<Node*>(m_->table_[bucket_index_]);
-           while ((l = l->next) != NULL) {
-             if (l == node_) {
-@@ -501,7 +501,7 @@ class Map {
-         // find-like method that compares Node* instead of const Key&.
-         iterator_base i(m_->find(*KeyPtrFromNodePtr(node_), it));
-         bucket_index_ = i.bucket_index_;
--        return m_->TableEntryIsList(bucket_index_);
-+        return (*m_).TableEntryIsList(bucket_index_);
-       }
- 
-       Node* node_;

Copied: tensorflow/repos/community-x86_64/protobuf_temp_fix_cuda10.1.patch (from rev 483353, tensorflow/trunk/protobuf_temp_fix_cuda10.1.patch)
===================================================================
--- protobuf_temp_fix_cuda10.1.patch	                        (rev 0)
+++ protobuf_temp_fix_cuda10.1.patch	2019-06-23 23:19:55 UTC (rev 483354)
@@ -0,0 +1,35 @@
+diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
+index 40f35e92..1af91f9c 100644
+--- a/src/google/protobuf/map.h
++++ b/src/google/protobuf/map.h
+@@ -425,10 +425,10 @@ class Map {
+         node_ = NULL;
+         for (bucket_index_ = start_bucket; bucket_index_ < m_->num_buckets_;
+              bucket_index_++) {
+-          if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
++          if ((*m_).TableEntryIsNonEmptyList(bucket_index_)) {
+             node_ = static_cast<Node*>(m_->table_[bucket_index_]);
+             break;
+-          } else if (m_->TableEntryIsTree(bucket_index_)) {
++          } else if ((*m_).TableEntryIsTree(bucket_index_)) {
+             Tree* tree = static_cast<Tree*>(m_->table_[bucket_index_]);
+             GOOGLE_DCHECK(!tree->empty());
+             node_ = NodePtrFromKeyPtr(*tree->begin());
+@@ -487,7 +487,7 @@ class Map {
+           return true;
+         // Less common: the bucket is a linked list with node_ somewhere in it,
+         // but not at the head.
+-        if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
++        if ((*m_).TableEntryIsNonEmptyList(bucket_index_)) {
+           Node* l = static_cast<Node*>(m_->table_[bucket_index_]);
+           while ((l = l->next) != NULL) {
+             if (l == node_) {
+@@ -501,7 +501,7 @@ class Map {
+         // find-like method that compares Node* instead of const Key&.
+         iterator_base i(m_->find(*KeyPtrFromNodePtr(node_), it));
+         bucket_index_ = i.bucket_index_;
+-        return m_->TableEntryIsList(bucket_index_);
++        return (*m_).TableEntryIsList(bucket_index_);
+       }
+ 
+       Node* node_;

Deleted: protobuf_temp_fix_cuda10.1_apply.patch
===================================================================
--- protobuf_temp_fix_cuda10.1_apply.patch	2019-06-23 23:19:37 UTC (rev 483353)
+++ protobuf_temp_fix_cuda10.1_apply.patch	2019-06-23 23:19:55 UTC (rev 483354)
@@ -1,44 +0,0 @@
-diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
-index dff151246a..d3fe95ec04 100755
---- a/tensorflow/workspace.bzl
-+++ b/tensorflow/workspace.bzl
-@@ -349,11 +349,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-     )
- 
-     PROTOBUF_URLS = [
--        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.6.1.2.tar.gz",
--        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.2.tar.gz",
-+        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz",
-+        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz",
-     ]
--    PROTOBUF_SHA256 = "2244b0308846bb22b4ff0bcc675e99290ff9f1115553ae9671eba1030af31bc0"
--    PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1.2"
-+    PROTOBUF_SHA256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a"
-+    PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1.3"
- 
-     tf_http_archive(
-         name = "protobuf_archive",
-@@ -364,6 +364,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
-         },
-         urls = PROTOBUF_URLS,
-+        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
-     )
- 
-     # We need to import the protobuf library under the names com_google_protobuf
-@@ -378,6 +379,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
-         },
-         urls = PROTOBUF_URLS,
-+        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
-     )
- 
-     tf_http_archive(
-@@ -389,6 +391,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
-         },
-         urls = PROTOBUF_URLS,
-+        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
-     )
- 
-     tf_http_archive(

Copied: tensorflow/repos/community-x86_64/protobuf_temp_fix_cuda10.1_apply.patch (from rev 483353, tensorflow/trunk/protobuf_temp_fix_cuda10.1_apply.patch)
===================================================================
--- protobuf_temp_fix_cuda10.1_apply.patch	                        (rev 0)
+++ protobuf_temp_fix_cuda10.1_apply.patch	2019-06-23 23:19:55 UTC (rev 483354)
@@ -0,0 +1,44 @@
+diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
+index dff151246a..d3fe95ec04 100755
+--- a/tensorflow/workspace.bzl
++++ b/tensorflow/workspace.bzl
+@@ -349,11 +349,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+     )
+ 
+     PROTOBUF_URLS = [
+-        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.6.1.2.tar.gz",
+-        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.2.tar.gz",
++        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz",
++        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz",
+     ]
+-    PROTOBUF_SHA256 = "2244b0308846bb22b4ff0bcc675e99290ff9f1115553ae9671eba1030af31bc0"
+-    PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1.2"
++    PROTOBUF_SHA256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a"
++    PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1.3"
+ 
+     tf_http_archive(
+         name = "protobuf_archive",
+@@ -364,6 +364,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
+         },
+         urls = PROTOBUF_URLS,
++        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
+     )
+ 
+     # We need to import the protobuf library under the names com_google_protobuf
+@@ -378,6 +379,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
+         },
+         urls = PROTOBUF_URLS,
++        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
+     )
+ 
+     tf_http_archive(
+@@ -389,6 +391,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
+         },
+         urls = PROTOBUF_URLS,
++        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
+     )
+ 
+     tf_http_archive(


More information about the arch-commits mailing list