Upgrade aws cpp sdk

This commit is contained in:
Rahul Huilgol 2020-01-31 20:28:52 +00:00
parent 20f9bb5ba4
commit 6759808168
7 changed files with 203 additions and 6 deletions

View File

@ -69,6 +69,8 @@ void AWSLogSystem::LogMessage(Aws::Utils::Logging::LogLevel log_level,
}
}
void AWSLogSystem::Flush() { return; }
namespace {
// Taken from tensorflow/core/platform/default/logging.cc

View File

@ -55,6 +55,9 @@ class AWSLogSystem : public Aws::Utils::Logging::LogSystemInterface {
const char* tag,
const Aws::OStringStream& messageStream) override;
// Flushes the buffered messages if the logger supports buffering
virtual void Flush() override;
private:
void LogMessage(Aws::Utils::Logging::LogLevel log_level,
const string& message);

View File

@ -44,7 +44,9 @@ cc_library(
"aws-cpp-sdk-core/source/http/standard/**/*.cpp",
"aws-cpp-sdk-core/source/utils/*.cpp",
"aws-cpp-sdk-core/source/utils/base64/**/*.cpp",
"aws-cpp-sdk-core/source/utils/event/*.cpp",
"aws-cpp-sdk-core/source/utils/json/**/*.cpp",
"aws-cpp-sdk-core/source/utils/logging/*.cpp",
"aws-cpp-sdk-core/source/utils/logging/**/*.cpp",
"aws-cpp-sdk-core/source/utils/memory/**/*.cpp",
"aws-cpp-sdk-core/source/utils/stream/**/*.cpp",
@ -54,35 +56,43 @@ cc_library(
"aws-cpp-sdk-core/source/utils/crypto/factory/**/*.cpp",
"aws-cpp-sdk-s3/include/**/*.h",
"aws-cpp-sdk-s3/source/**/*.cpp",
"aws-cpp-sdk-core/source/monitoring/*.cpp",
"aws-cpp-sdk-core/source/net/linux-shared/*.cpp",
"aws-cpp-sdk-core/source/utils/memory/*.cpp",
"aws-cpp-sdk-core/source/utils/crypto/openssl/*.cpp",
]),
hdrs = [
"aws-cpp-sdk-core/include/aws/core/SDKConfig.h",
],
copts = [
"-DAWS_SDK_VERSION_MAJOR=1",
"-DAWS_SDK_VERSION_MINOR=5",
"-DAWS_SDK_VERSION_PATCH=8",
"-DAWS_SDK_VERSION_MINOR=7",
"-DAWS_SDK_VERSION_PATCH=226",
],
defines = select({
"@org_tensorflow//tensorflow:linux_aarch64": [
"PLATFORM_LINUX",
"ENABLE_CURL_CLIENT",
"ENABLE_NO_ENCRYPTION",
"OPENSSL_IS_BORINGSSL",
],
"@org_tensorflow//tensorflow:linux_x86_64": [
"PLATFORM_LINUX",
"ENABLE_CURL_CLIENT",
"ENABLE_NO_ENCRYPTION",
"OPENSSL_IS_BORINGSSL",
],
"@org_tensorflow//tensorflow:macos": [
"PLATFORM_APPLE",
"ENABLE_CURL_CLIENT",
"ENABLE_NO_ENCRYPTION",
"OPENSSL_IS_BORINGSSL",
],
"@org_tensorflow//tensorflow:linux_ppc64le": [
"PLATFORM_LINUX",
"ENABLE_CURL_CLIENT",
"ENABLE_NO_ENCRYPTION",
"OPENSSL_IS_BORINGSSL",
],
"//conditions:default": [],
}),
@ -92,7 +102,18 @@ cc_library(
],
deps = [
"@curl",
"@boringssl//:crypto",
"@aws-c-common",
"@aws-c-event-stream",
"@aws-checksums",
],
copts = [
"-DENABLE_OPENSSL_ENCRYPTION",
"-DAWS_SDK_VERSION_MAJOR=1",
"-DAWS_SDK_VERSION_MINOR=7",
"-DAWS_SDK_VERSION_PATCH=226",
"-DOPENSSL_IS_BORINGSSL",
],
)
template_rule(

67
third_party/aws/aws-c-common.bazel vendored Normal file
View File

@ -0,0 +1,67 @@
# Description:
# AWS C++ SDK
package(default_visibility = ["//visibility:public"])
licenses(["notice"]) # Apache 2.0
exports_files(["LICENSE"])
load("@org_tensorflow//third_party:common.bzl", "template_rule")
cc_library(
name = "aws-c-common",
srcs = select({
"@org_tensorflow//tensorflow:linux_aarch64": glob([
"source/posix/*.c",
]),
"@org_tensorflow//tensorflow:linux_x86_64": glob([
"source/posix/*.c",
]),
"@org_tensorflow//tensorflow:macos": glob([
"source/posix/*.c",
]),
"@org_tensorflow//tensorflow:linux_ppc64le": glob([
"source/posix/*.c",
]),
"@org_tensorflow//tensorflow:raspberry_pi_armeabi": glob([
"source/posix/*.c",
]),
"//conditions:default": [],
}) + glob([
"source/*.c",
"include/aws/common/*.h",
"include/**/*.h",
]),
hdrs = [
"include/aws/common/config.h",
],
includes = [
"include/",
],
deps = [
],
copts = [
"-std=c99",
"-D_POSIX_C_SOURCE=199309L",
"-D_GNU_SOURCE",
],
linkopts = [
"-lrt",
"-pthread",
],
)
template_rule(
name = "config_h",
src = "include/aws/common/config.h.in",
out = "include/aws/common/config.h",
substitutions = {
"cmakedefine AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS": "undef AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS",
"cmakedefine AWS_HAVE_GCC_INLINE_ASM": "define AWS_HAVE_GCC_INLINE_ASM",
"cmakedefine AWS_HAVE_MSVC_MULX": "undef AWS_HAVE_MSVC_MULX",
"cmakedefine AWS_HAVE_EXECINFO": "define AWS_HAVE_EXECINFO",
},
)

View File

@ -0,0 +1,35 @@
# Description:
# AWS C++ SDK
package(default_visibility = ["//visibility:public"])
licenses(["notice"]) # Apache 2.0
exports_files(["LICENSE"])
cc_library(
name = "aws-c-event-stream",
srcs = glob([
"source/*.c",
"include/**/*.h",
]),
hdrs = [
],
includes = [
"include/",
],
deps = [
"@aws-c-common",
"@aws-checksums",
],
copts = [
"-std=c99",
"-D_POSIX_C_SOURCE=199309L",
"-D_GNU_SOURCE",
],
linkopts = [
"-lrt",
"-pthread",
],
)

35
third_party/aws/aws-checksums.bazel vendored Normal file
View File

@ -0,0 +1,35 @@
# Description:
# AWS C++ SDK
package(default_visibility = ["//visibility:public"])
licenses(["notice"]) # Apache 2.0
exports_files(["LICENSE"])
cc_library(
name = "aws-checksums",
srcs = glob([
"source/intel/*.c",
"source/*.c",
"include/**/*.h",
]),
hdrs = [
],
includes = [
"include/",
],
deps = [
"@aws-c-common",
],
copts = [
#"-std=c99",
#"-D_POSIX_C_SOURCE=199309L",
#"-D_GNU_SOURCE",
],
linkopts = [
#"-lrt",
#"-pthread",
],
)

View File

@ -9,10 +9,44 @@ def repo():
third_party_http_archive(
name = "aws",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/aws/aws-sdk-cpp/archive/1.5.8.tar.gz",
"https://github.com/aws/aws-sdk-cpp/archive/1.5.8.tar.gz",
"https://mirror.bazel.build/github.com/aws/aws-sdk-cpp/archive/1.7.226.tar.gz",
"https://github.com/aws/aws-sdk-cpp/archive/1.7.226.tar.gz",
],
sha256 = "89905075fe50aa13e0337ff905c2e8c1ce9caf77a3504484a7cda39179120ffc",
strip_prefix = "aws-sdk-cpp-1.5.8",
sha256 = "3a6eff15ee73a1a73c4c16ef2582eaef8647821750dab6d5cd0f137103b5c488",
strip_prefix = "aws-sdk-cpp-1.7.226",
build_file = "//third_party/aws:BUILD.bazel",
)
third_party_http_archive(
name = "aws-c-common",
urls = [
"http://mirror.tensorflow.org/github.com/awslabs/aws-c-common/archive/v0.4.20.tar.gz",
"https://github.com/awslabs/aws-c-common/archive/v0.4.20.tar.gz"
],
sha256 = "b0a86df4731fb5de00c5caaf95450ca26a1c0405919aee39927a9455bc5a6b05",
strip_prefix = "aws-c-common-0.4.20",
build_file = "//third_party/aws:aws-c-common.bazel",
)
third_party_http_archive(
name = "aws-c-event-stream",
urls = [
"https://mirror.tensorflow.org/github.com/awslabs/aws-c-event-stream/archive/v0.1.4.tar.gz",
"https://github.com/awslabs/aws-c-event-stream/archive/v0.1.4.tar.gz",
],
sha256 = "31d880d1c868d3f3df1e1f4b45e56ac73724a4dc3449d04d47fc0746f6f077b6",
strip_prefix = "aws-c-event-stream-0.1.4",
build_file = "//third_party/aws:aws-c-event-stream.bazel",
)
third_party_http_archive(
name = "aws-checksums",
urls = [
"https://mirror.tensorflow.org/github.com/awslabs/aws-checksums/archive/v0.1.5.tar.gz",
"https://github.com/awslabs/aws-checksums/archive/v0.1.5.tar.gz",
],
sha256 = "6e6bed6f75cf54006b6bafb01b3b96df19605572131a2260fddaf0e87949ced0",
strip_prefix = "aws-checksums-0.1.5",
build_file = "//third_party/aws:aws-checksums.bazel",
)