[arch-commits] Commit in tensorflow/trunk (PKGBUILD protobuf-python37-apply.patch)
Sven-Hendrik Haase
svenstaro at archlinux.org
Thu Oct 4 11:24:08 UTC 2018
Date: Thursday, October 4, 2018 @ 11:24:08
Author: svenstaro
Revision: 389472
upgpkg: tensorflow 1.11.0-1
Modified:
tensorflow/trunk/PKGBUILD
tensorflow/trunk/protobuf-python37-apply.patch
-------------------------------+
PKGBUILD | 39 +++++++++++++++----------------
protobuf-python37-apply.patch | 49 ++++++++++++++++++++--------------------
2 files changed, 44 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-04 11:23:50 UTC (rev 389471)
+++ PKGBUILD 2018-10-04 11:24:08 UTC (rev 389472)
@@ -4,32 +4,29 @@
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.10.1
-_pkgver=1.10.1
-pkgrel=2
+pkgver=1.11.0
+_pkgver=1.11.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' 'cuda' 'nvidia-utils'
- 'cudnn' 'python-pip' 'python-wheel' 'python-setuptools')
+makedepends=('bazel' 'python-numpy' 'cuda' 'nvidia-utils' 'nccl'
+ '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"
python37.patch
protobuf-python37.patch
- protobuf-python37-apply.patch
- 21017.patch)
-sha512sums=('c066d6caad10def9b3b9c6ca50dd19fa3c9587c878ce149a2a34d6c61085f858c6c9246c419c49bc099efd88d765b2654a463ac8fbef751308c7edecc8b7700f'
+ protobuf-python37-apply.patch)
+sha512sums=('26e9542c43e11a663cbc5cf42859ae7b6dc0e92cfa88775fd4d1badba7f08c59b60c05010fd9f3ec501313be5c042f39b17323bb4753babf365ba2a48af836c2'
'9e3954c10f9dc11d3b6a6a0162061511eaa81b934debaf4f159f11f60e235e6f2762a216d10927695497e8cf7065855d343cd1573727da3f6355e669ea7c6788'
'a248658d9466bd3aba854b429ce2c1981c5efff5196dead7b2a8c216b9a6cac781a9f487db5ff4513becc4e6d6cc14c494768a859e1f51a9eea848d8f0178204'
- 'fcff7163f6b979018ef4c09dc927ab8dc784b778d8a1bca6d986cc6797fa12f9b5cd902b344fd25c74ac13f71c022f515066d909d9b42e6c3be0ff214f1c7ca8'
- '3125df6b51cc835c22733f187e3d3f85ee7016d3b1c254ee1fae339c493a988c0220ce3fbd473ac54f6983460dd0b0bc38fca2ee8e007d22b4e24c7f2539069f')
+ '081ff5e35b643c63d3fc28d75266fe13fe70f8f274c862ff7959ec360654ae15593e8c45379a6b23c91fb475af6b9315188f3bfec866fddbbb86a0613d3aa738')
prepare() {
- # https://github.com/tensorflow/tensorflow/pull/21017
- patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/21017.patch
# https://github.com/tensorflow/tensorflow/issues/20517
- patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/python37.patch
+ # patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/python37.patch
# https://github.com/tensorflow/tensorflow/issues/20950
patch -d tensorflow-${_pkgver} -Np1 -i ${srcdir}/protobuf-python37-apply.patch
cp ${srcdir}/protobuf-python37.patch tensorflow-${_pkgver}/third_party/
@@ -53,9 +50,11 @@
export TF_NEED_OPENCL=0
export TF_NEED_MPI=0
export TF_NEED_TENSORRT=0
+ export TF_NEED_NGRAPH=0
export TF_SET_ANDROID_WORKSPACE=0
export TF_DOWNLOAD_CLANG=0
- export TF_NCCL_VERSION=1.3 # configure.py: _DEFAULT_NCCL_VERSION
+ export TF_NCCL_VERSION=2.3
+ export NCCL_INSTALL_PATH=/usr
}
build() {
@@ -131,7 +130,7 @@
}
package_tensorflow-cuda() {
- depends=(cuda cudnn)
+ depends=(cuda cudnn nccl)
conflicts=(tensorflow)
provides=(tensorflow)
pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA)"
@@ -147,7 +146,7 @@
}
package_tensorflow-opt-cuda() {
- depends=(cuda cudnn)
+ depends=(cuda cudnn nccl)
conflicts=(tensorflow)
provides=(tensorflow tensorflow-cuda)
pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA and CPU optimizations)"
@@ -163,7 +162,7 @@
}
package_python-tensorflow() {
- depends=(python-numpy python-protobuf absl-py)
+ depends=(python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing)
cd ${srcdir}/tensorflow-${_pkgver}
@@ -179,7 +178,7 @@
}
package_python-tensorflow-opt() {
- depends=(python-numpy python-protobuf absl-py)
+ depends=(python-numpy python-protobuf absl-py python-h5py python-keras-applications python-keras-preprocessing)
conflicts=(python-tensorflow)
provides=(python-tensorflow)
pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CPU optimizations)"
@@ -198,7 +197,7 @@
}
package_python-tensorflow-cuda() {
- depends=(python-numpy cuda cudnn python-pycuda python-protobuf absl-py)
+ depends=(python-numpy cuda cudnn python-pycuda python-protobuf absl-py nccl python-h5py python-keras-applications python-keras-preprocessing)
conflicts=(python-tensorflow)
provides=(python-tensorflow)
pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA)"
@@ -217,7 +216,7 @@
}
package_python-tensorflow-opt-cuda() {
- depends=(python-numpy cuda cudnn python-pycuda python-protobuf absl-py)
+ depends=(python-numpy cuda cudnn python-pycuda python-protobuf absl-py nccl python-h5py python-keras-applications python-keras-preprocessing)
conflicts=(python-tensorflow)
provides=(python-tensorflow python-tensorflow-cuda)
pkgdesc="Library for computation using data flow graphs for scalable machine learning (with CUDA and CPU optimizations)"
Modified: protobuf-python37-apply.patch
===================================================================
--- protobuf-python37-apply.patch 2018-10-04 11:23:50 UTC (rev 389471)
+++ protobuf-python37-apply.patch 2018-10-04 11:24:08 UTC (rev 389472)
@@ -1,27 +1,28 @@
-diff -upr tensorflow-1.9.0.orig/tensorflow/workspace.bzl tensorflow-1.9.0/tensorflow/workspace.bzl
---- tensorflow-1.9.0.orig/tensorflow/workspace.bzl 2018-07-30 13:22:06.387368887 +0300
-+++ tensorflow-1.9.0/tensorflow/workspace.bzl 2018-07-30 13:26:15.734924242 +0300
-@@ -335,6 +335,7 @@ def tf_workspace(path_prefix="", tf_repo
- ],
- sha256 = "50a5753995b3142627ac55cfd496cebc418a2e575ca0236e29033c67bd5665f4",
- strip_prefix = "protobuf-3.6.0",
-+ patch_file = clean_dep("//third_party:protobuf-python37.patch"),
- )
+diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
+index 758c94c542..42312d7eeb 100755
+--- a/tensorflow/workspace.bzl
++++ b/tensorflow/workspace.bzl
+@@ -377,6 +377,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+ urls = PROTOBUF_URLS,
+ sha256 = PROTOBUF_SHA256,
+ strip_prefix = PROTOBUF_STRIP_PREFIX,
++ patch_file = clean_dep("//third_party:protobuf-python37.patch"),
+ )
- # We need to import the protobuf library under the names com_google_protobuf
-@@ -348,6 +349,7 @@ def tf_workspace(path_prefix="", tf_repo
- ],
- sha256 = "50a5753995b3142627ac55cfd496cebc418a2e575ca0236e29033c67bd5665f4",
- strip_prefix = "protobuf-3.6.0",
-+ patch_file = clean_dep("//third_party:protobuf-python37.patch"),
- )
+ # We need to import the protobuf library under the names com_google_protobuf
+@@ -387,6 +388,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+ urls = PROTOBUF_URLS,
+ sha256 = PROTOBUF_SHA256,
+ strip_prefix = PROTOBUF_STRIP_PREFIX,
++ patch_file = clean_dep("//third_party:protobuf-python37.patch"),
+ )
- tf_http_archive(
-@@ -358,6 +360,7 @@ def tf_workspace(path_prefix="", tf_repo
- ],
- sha256 = "50a5753995b3142627ac55cfd496cebc418a2e575ca0236e29033c67bd5665f4",
- strip_prefix = "protobuf-3.6.0",
-+ patch_file = clean_dep("//third_party:protobuf-python37.patch"),
- )
+ tf_http_archive(
+@@ -394,6 +396,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
+ urls = PROTOBUF_URLS,
+ sha256 = PROTOBUF_SHA256,
+ strip_prefix = PROTOBUF_STRIP_PREFIX,
++ patch_file = clean_dep("//third_party:protobuf-python37.patch"),
+ )
- tf_http_archive(
+ tf_http_archive(
More information about the arch-commits
mailing list