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

Thu Dec 6 13:02:07 UTC 2018

Date: Thursday, December 6, 2018 @ 13:02:06
  Author: svenstaro
Revision: 411718

Prepare for cudnn 7.4 rebuild

Added:
  tensorflow/trunk/5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch
Modified:
  tensorflow/trunk/PKGBUILD

------------------------------------------------+
 5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch |   82 +++++++++++++++++++++++
 PKGBUILD                                       |   17 ++--
 2 files changed, 92 insertions(+), 7 deletions(-)

Added: 5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch
===================================================================

--- 5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch	                        (rev 0)
+++ 5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch	2018-12-06 13:02:06 UTC (rev 411718)
@@ -0,0 +1,82 @@
+commit 5b14577d42842871f1cb0eb8dfe77d32db1eb654
+Author: A. Unique TensorFlower <gardener at tensorflow.org>
+Date:   Fri Nov 30 11:11:23 2018 -0800
+
+    Use Starlark version of http_archive
+    
+    The native http_archive and new_http_archive will be removed in 0.20.0
+    
+    PiperOrigin-RevId: 223544202
+
+diff --git a/WORKSPACE b/WORKSPACE
+index 0c7bc085b5..7cc08e0164 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -1,5 +1,7 @@
+ workspace(name = "org_tensorflow")
+ 
++load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
++
+ http_archive(
+     name = "io_bazel_rules_closure",
+     sha256 = "a38539c5b5c358548e75b44141b4ab637bba7c4dc02b46b1f62a96d6433f56ae",
+@@ -57,9 +59,9 @@ android_workspace()
+ # Please add all new TensorFlow dependencies in workspace.bzl.
+ tf_workspace()
+ 
+-new_http_archive(
++http_archive(
+     name = "inception_v1",
+-    build_file = "models.BUILD",
++    build_file = "//:models.BUILD",
+     sha256 = "7efe12a8363f09bc24d7b7a450304a15655a57a7751929b2c1593a71183bb105",
+     urls = [
+         "http://storage.googleapis.com/download.tensorflow.org/models/inception_v1.zip",
+@@ -67,9 +69,9 @@ new_http_archive(
+     ],
+ )
+ 
+-new_http_archive(
++http_archive(
+     name = "mobile_ssd",
+-    build_file = "models.BUILD",
++    build_file = "//:models.BUILD",
+     sha256 = "bddd81ea5c80a97adfac1c9f770e6f55cbafd7cce4d3bbe15fbeb041e6b8f3e8",
+     urls = [
+         "http://storage.googleapis.com/download.tensorflow.org/models/object_detection/ssd_mobilenet_v1_android_export.zip",
+@@ -77,9 +79,9 @@ new_http_archive(
+     ],
+ )
+ 
+-new_http_archive(
++http_archive(
+     name = "mobile_multibox",
+-    build_file = "models.BUILD",
++    build_file = "//:models.BUILD",
+     sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96",
+     urls = [
+         "http://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip",
+@@ -87,9 +89,9 @@ new_http_archive(
+     ],
+ )
+ 
+-new_http_archive(
++http_archive(
+     name = "stylize",
+-    build_file = "models.BUILD",
++    build_file = "//:models.BUILD",
+     sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa",
+     urls = [
+         "http://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip",
+@@ -97,9 +99,9 @@ new_http_archive(
+     ],
+ )
+ 
+-new_http_archive(
++http_archive(
+     name = "speech_commands",
+-    build_file = "models.BUILD",
++    build_file = "//:models.BUILD",
+     sha256 = "c3ec4fea3158eb111f1d932336351edfe8bd515bb6e87aad4f25dbad0a600d0c",
+     urls = [
+         "http://storage.googleapis.com/download.tensorflow.org/models/speech_commands_v0.01.zip",

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-06 12:48:26 UTC (rev 411717)
+++ PKGBUILD	2018-12-06 13:02:06 UTC (rev 411718)
@@ -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=1
+pkgrel=2
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')
@@ -22,14 +22,17 @@
         protobuf-python37.patch
         protobuf-python37-apply.patch
         # try_import.patch
-        explicitly_import_bazelrc.patch)
+        explicitly_import_bazelrc.patch
+        5b14577d42842871f1cb0eb8dfe77d32db1eb654.patch)
 sha512sums=('b145a9118856aa00a829ab6af89bff4e1e131371c96d77b07532544112803c4574d97ef224b28a64437a2af8db4286786dc0b4123efe110b2aa734b443a7e238'
             'b9821d8eed1bb0125ddb8ebc46e8a4b8630789aac9b35aa4ecf24459476370f8b57fcf016952d7b7b61bee4177124abba343b7c9e956645b8895d2680f84e29a'
             'c5e24f584153752e7e22f472c8b0378dce8d0e07fa44598f571d27707d1ac5d0917ca1b6556c59259ef27c1405da6f83b9080ed803550ae6a6121ea3054d3111'
             'e13399375a8d61f695f67be20d86570b0e7e9b8682ea00eb689b3638e2b12ce50cb45fbe46f2ce1b1f065d043a29b8fac1b96eeec01317415ef2d8b51ac8332a'
-            'b4567bef73007c388ae782cda0b9f2e06c7d87de03e97dfd99e258275cd60be8a1fa07359eae24316f9d059e00b6abc632d7c72f84318de1a6f4902f59d6fd8e')
+            'b4567bef73007c388ae782cda0b9f2e06c7d87de03e97dfd99e258275cd60be8a1fa07359eae24316f9d059e00b6abc632d7c72f84318de1a6f4902f59d6fd8e'
+            'b6807d1958f7a53ee5f86a873214ccbe4d648fe9845e9c5e0183feab67e244bcf02af8db0847283383fed627783975a65a39350306f3b21122e7cbd195b84e2e')
 
 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
@@ -84,8 +87,8 @@
   # export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
   export CUDA_TOOLKIT_PATH=/opt/cuda
   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 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
   ./configure
   bazel build --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package
@@ -106,8 +109,8 @@
   # export CLANG_CUDA_COMPILER_PATH=/usr/bin/clang
   export CUDA_TOOLKIT_PATH=/opt/cuda
   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 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
   ./configure
   bazel build --config=opt --config=cuda //tensorflow:libtensorflow.so //tensorflow/tools/pip_package:build_pip_package

