From 783627bf63cdfa467e7811f2bf8330555d66f313 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Mon, 8 Oct 2018 15:55:18 -0700 Subject: [PATCH] Convert TensorFlow's aws dependency to new third party import method. PiperOrigin-RevId: 216265275 --- tensorflow/workspace.bzl | 14 +++----------- third_party/aws/BUILD | 1 + third_party/{aws.BUILD => aws/BUILD.bazel} | 0 third_party/aws/workspace.bzl | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 third_party/aws/BUILD rename third_party/{aws.BUILD => aws/BUILD.bazel} (100%) create mode 100644 third_party/aws/workspace.bzl diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index adeac62e43b..40c226a8618 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -20,12 +20,15 @@ load( "//tensorflow/tools/def_file_filter:def_file_filter_configure.bzl", "def_file_filter_configure", ) +load("//third_party/aws:workspace.bzl", aws = "repo") load("//third_party/flatbuffers:workspace.bzl", flatbuffers = "repo") load("//third_party/icu:workspace.bzl", icu = "repo") load("//third_party/jpeg:workspace.bzl", jpeg = "repo") load("//third_party/nasm:workspace.bzl", nasm = "repo") def initialize_third_party(): + """ Load third party repositories. See above load() statements. """ + aws() flatbuffers() icu() jpeg() @@ -585,17 +588,6 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): ], ) - tf_http_archive( - name = "aws", - build_file = clean_dep("//third_party:aws.BUILD"), - sha256 = "b888d8ce5fc10254c3dd6c9020c7764dd53cf39cf011249d0b4deda895de1b7c", - strip_prefix = "aws-sdk-cpp-1.3.15", - urls = [ - "https://mirror.bazel.build/github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz", - "https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz", - ], - ) - java_import_external( name = "junit", jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a", diff --git a/third_party/aws/BUILD b/third_party/aws/BUILD new file mode 100644 index 00000000000..2f5d02becb9 --- /dev/null +++ b/third_party/aws/BUILD @@ -0,0 +1 @@ +# Dummy BUILD file to make this directory a package. diff --git a/third_party/aws.BUILD b/third_party/aws/BUILD.bazel similarity index 100% rename from third_party/aws.BUILD rename to third_party/aws/BUILD.bazel diff --git a/third_party/aws/workspace.bzl b/third_party/aws/workspace.bzl new file mode 100644 index 00000000000..c2166381549 --- /dev/null +++ b/third_party/aws/workspace.bzl @@ -0,0 +1,15 @@ +"""loads the aws library, used by TF.""" + +load("//third_party:repo.bzl", "third_party_http_archive") + +def repo(): + third_party_http_archive( + name = "aws", + urls = [ + "https://mirror.bazel.build/github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz", + "https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz", + ], + sha256 = "b888d8ce5fc10254c3dd6c9020c7764dd53cf39cf011249d0b4deda895de1b7c", + strip_prefix = "aws-sdk-cpp-1.3.15", + build_file = "//third_party/aws:BUILD.bazel", + )