From 0a5e8476466f8f08760d05301e69223a3786648e Mon Sep 17 00:00:00 2001
From: Vo Van Nghia <vovannghia2409@gmail.com>
Date: Thu, 10 Sep 2020 22:09:26 +0700
Subject: [PATCH] Bump google-cloud-cpp to 1.17.1
---
tensorflow/workspace.bzl | 18 +++++-------------
third_party/ngraph/nlohmann_json.BUILD | 7 +++++++
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 804cd01e2e1..21a82238cc3 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -314,15 +314,6 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
],
)
- http_file(
- name = "com_github_nlohmann_json_single_header",
- sha256 = "63da6d1f22b2a7bb9e4ff7d6b255cf691a161ff49532dcc45d398a53e295835f",
- urls = [
- "https://storage.googleapis.com/mirror.tensorflow.org/github.com/nlohmann/json/releases/download/v3.4.0/json.hpp",
- "https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp",
- ],
- )
-
tf_http_archive(
name = "com_github_google_crc32c",
sha256 = "6b3b1d861bb8307658b2407bc7a4c59e566855ef5368a60b35c893551e4788e9",
@@ -336,18 +327,19 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
tf_http_archive(
name = "com_github_googlecloudplatform_google_cloud_cpp",
- sha256 = "d9d1358f464328b8fd6d24a98d4c2876fde0d3fdb06c8b6bd617be7fb9b0fbac",
- strip_prefix = "google-cloud-cpp-1.16.0",
+ sha256 = "ff82045b9491f0d880fc8e5c83fd9542eafb156dcac9ff8c6209ced66ed2a7f0",
+ strip_prefix = "google-cloud-cpp-1.17.1",
repo_mapping = {
"@com_github_curl_curl": "@curl",
+ "@com_github_nlohmann_json": "@nlohmann_json_lib",
},
system_build_file = clean_dep("//third_party/systemlibs:google_cloud_cpp.BUILD"),
system_link_files = {
"//third_party/systemlibs:google_cloud_cpp.google.cloud.bigtable.BUILD": "google/cloud/bigtable/BUILD",
},
urls = [
- "https://storage.googleapis.com/mirror.tensorflow.org/github.com/googleapis/google-cloud-cpp/archive/v1.16.0.tar.gz",
- "https://github.com/googleapis/google-cloud-cpp/archive/v1.16.0.tar.gz",
+ "https://storage.googleapis.com/mirror.tensorflow.org/github.com/googleapis/google-cloud-cpp/archive/v1.17.1.tar.gz",
+ "https://github.com/googleapis/google-cloud-cpp/archive/v1.17.1.tar.gz",
],
)
diff --git a/third_party/ngraph/nlohmann_json.BUILD b/third_party/ngraph/nlohmann_json.BUILD
index 04c8db6a961..1d8fa92e9c1 100644
--- a/third_party/ngraph/nlohmann_json.BUILD
+++ b/third_party/ngraph/nlohmann_json.BUILD
@@ -13,3 +13,10 @@ cc_library(
visibility = ["//visibility:public"],
alwayslink = 1,
)
+
+cc_library(
+ name = "nlohmann_json",
+ includes = ["include"],
+ visibility = ["//visibility:public"],
+ deps = ["nlohmann_json_lib"],
+)