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

[Konstantin Gizdov]

    Date: Tuesday, March 26, 2019 @ 21:34:42
  Author: kgizdov
Revision: 443709

add patches too...

Added:
  tensorflow/trunk/protobuf_temp_fix_cuda10.1.patch
  tensorflow/trunk/protobuf_temp_fix_cuda10.1_apply.patch

----------------------------------------+
 protobuf_temp_fix_cuda10.1.patch       |   35 ++++++++++++++++++++++++
 protobuf_temp_fix_cuda10.1_apply.patch |   44 +++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

Added: protobuf_temp_fix_cuda10.1.patch
===================================================================
--- protobuf_temp_fix_cuda10.1.patch	                        (rev 0)
+++ protobuf_temp_fix_cuda10.1.patch	2019-03-26 21:34:42 UTC (rev 443709)
@@ -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_;

Added: protobuf_temp_fix_cuda10.1_apply.patch
===================================================================
--- protobuf_temp_fix_cuda10.1_apply.patch	                        (rev 0)
+++ protobuf_temp_fix_cuda10.1_apply.patch	2019-03-26 21:34:42 UTC (rev 443709)
@@ -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(