From e182600350e61de6861cff6bf114f6e964932a7c Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 20 Aug 2022 01:00:06 -0700 Subject: [PATCH 1/2] Bump tensorflow to 2.10rc2 and various fixes. Signed-off-by: Yong Tang --- .bazelversion | 2 +- WORKSPACE | 6 ++-- tensorflow_io/python/ops/version_ops.py | 4 +-- third_party/arrow.BUILD | 39 ++++++++++--------------- third_party/fmjpeg2koj.BUILD | 7 +++++ third_party/libmemcached.BUILD | 5 +++- third_party/openexr.BUILD | 7 ++++- tools/build/configure.py | 4 ++- 8 files changed, 42 insertions(+), 32 deletions(-) diff --git a/.bazelversion b/.bazelversion index 0062ac971..ac14c3dfa 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -5.0.0 +5.1.1 diff --git a/WORKSPACE b/WORKSPACE index 5eb4e72dc..4b1b9a507 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -115,10 +115,10 @@ pip_install() http_archive( name = "org_tensorflow", - sha256 = "8087cb0c529f04a4bfe480e49925cd64a904ad16d8ec66b98e2aacdfd53c80ff", - strip_prefix = "tensorflow-2.9.0", + sha256 = "7edd8b544cc65254735210e03364fe9828f36430e09e9322fba9b0a4b2912580", + strip_prefix = "tensorflow-2.10.0-rc2", urls = [ - "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.9.0.tar.gz", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.10.0-rc2.tar.gz", ], ) diff --git a/tensorflow_io/python/ops/version_ops.py b/tensorflow_io/python/ops/version_ops.py index c9363b5f7..09e006c70 100644 --- a/tensorflow_io/python/ops/version_ops.py +++ b/tensorflow_io/python/ops/version_ops.py @@ -14,5 +14,5 @@ # ============================================================================== """version_ops""" -version = "0.26.0" -require = "tensorflow>=2.9.0,<2.10.0" +version = "0.27.0" +require = "tensorflow>=2.10.0rc2,<2.11.0" diff --git a/third_party/arrow.BUILD b/third_party/arrow.BUILD index 4dbce8ede..53ba65ba9 100644 --- a/third_party/arrow.BUILD +++ b/third_party/arrow.BUILD @@ -7,25 +7,6 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE.txt"]) -load("@flatbuffers//:build_defs.bzl", "flatbuffer_cc_library") - -flatbuffer_cc_library( - name = "arrow_format", - srcs = [ - "cpp/src/arrow/ipc/feather.fbs", - "format/File.fbs", - "format/Message.fbs", - "format/Schema.fbs", - "format/SparseTensor.fbs", - "format/Tensor.fbs", - ], - flatc_args = [ - "--scoped-enums", - "--gen-object-api", - ], - out_prefix = "cpp/src/generated/", -) - genrule( name = "arrow_util_config", srcs = ["cpp/src/arrow/util/config.h.cmake"], @@ -62,7 +43,6 @@ cc_library( "cpp/src/arrow/json/*.cc", "cpp/src/arrow/tensor/*.cc", "cpp/src/arrow/util/*.cc", - "cpp/src/arrow/vendored/musl/strptime.c", "cpp/src/arrow/vendored/optional.hpp", "cpp/src/arrow/vendored/string_view.hpp", "cpp/src/arrow/vendored/variant.hpp", @@ -71,6 +51,7 @@ cc_library( "cpp/src/parquet/**/*.cc", "cpp/src/generated/*.h", "cpp/src/generated/*.cpp", + "cpp/thirdparty/flatbuffers/include/flatbuffers/*.h", ], exclude = [ "cpp/src/**/*_benchmark.cc", @@ -87,13 +68,25 @@ cc_library( "cpp/src/arrow/util/bpacking_neon.cc", "cpp/src/arrow/util/tracing_internal.cc", ], - ), + ) + select({ + "@bazel_tools//src/conditions:windows": [ + "cpp/src/arrow/vendored/musl/strptime.c", + ], + "//conditions:default": [], + }), hdrs = [ # declare header from above genrule "cpp/src/arrow/util/config.h", "cpp/src/parquet/parquet_version.h", ], - copts = [], + copts = select({ + "@bazel_tools//src/conditions:windows": [ + "/std:c++14", + ], + "//conditions:default": [ + "-std=c++14", + ], + }), defines = [ "ARROW_WITH_BROTLI", "ARROW_WITH_SNAPPY", @@ -110,12 +103,12 @@ cc_library( includes = [ "cpp/src", "cpp/src/arrow/vendored/xxhash", + "cpp/thirdparty/flatbuffers/include", ], textual_hdrs = [ "cpp/src/arrow/vendored/xxhash/xxhash.c", ], deps = [ - ":arrow_format", "@boringssl//:crypto", "@brotli", "@bzip2", diff --git a/third_party/fmjpeg2koj.BUILD b/third_party/fmjpeg2koj.BUILD index c6fe2e374..905f33030 100644 --- a/third_party/fmjpeg2koj.BUILD +++ b/third_party/fmjpeg2koj.BUILD @@ -12,6 +12,13 @@ cc_library( "*.cc", "*.cpp", ]), + copts = select({ + "@bazel_tools//src/conditions:windows": [], + "//conditions:default": [ + "-Wno-register", + "-Wno-error", + ], + }), includes = [ "include", ], diff --git a/third_party/libmemcached.BUILD b/third_party/libmemcached.BUILD index 7beb2d7e2..05bedfeb9 100644 --- a/third_party/libmemcached.BUILD +++ b/third_party/libmemcached.BUILD @@ -22,7 +22,10 @@ cc_library( "config/libhashkit/hashkitcon.h", "config/mem_config.h", ], - copts = [], + copts = [ + "-Wno-register", + "-Wno-error", + ], includes = [ ".", "config", diff --git a/third_party/openexr.BUILD b/third_party/openexr.BUILD index bf1c6f44e..8cbc879c4 100644 --- a/third_party/openexr.BUILD +++ b/third_party/openexr.BUILD @@ -29,7 +29,12 @@ cc_library( "config/OpenEXRConfigInternal.h", ], hdrs = [], - copts = [], + copts = select({ + "@bazel_tools//src/conditions:windows": [ + "/std:c++14", + ], + "//conditions:default": [], + }), defines = select({ "@bazel_tools//src/conditions:darwin": [], "@bazel_tools//src/conditions:windows": [], diff --git a/tools/build/configure.py b/tools/build/configure.py index cfb56a9b6..2efb973ba 100644 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -101,7 +101,7 @@ def write_config(): bazel_rc.write( f'build --action_env TF_SHARED_LIBRARY_NAME="{library_name}"\n' ) - bazel_rc.write('build --cxxopt="-std=c++14"\n') + bazel_rc.write('build --cxxopt="-std=c++17"\n') for argv in sys.argv[1:]: if argv == "--cuda": bazel_rc.write('build --action_env TF_NEED_CUDA="1"\n') @@ -126,6 +126,8 @@ def write_config(): bazel_rc.write("build:macos --copt=-Wunguarded-availability\n") # MSVC (Windows): Standards-conformant preprocessor mode bazel_rc.write('build:windows --copt="/Zc:preprocessor"\n') + bazel_rc.write('build:windows --copt="/std:c++17"\n') + bazel_rc.write('build:windows --copt="/std:c++17"\n') # Config for CI and release build bazel_rc.write("build:optimization --copt=-msse4.2\n") bazel_rc.write("build:optimization --copt=-mavx\n") From 05024f81cc33642ff3a45d8b12bff40432f5a383 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 26 Aug 2022 14:50:13 -0700 Subject: [PATCH 2/2] Update configure.py --- tools/build/configure.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/build/configure.py b/tools/build/configure.py index 2efb973ba..afa0e1bde 100644 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -127,7 +127,6 @@ def write_config(): # MSVC (Windows): Standards-conformant preprocessor mode bazel_rc.write('build:windows --copt="/Zc:preprocessor"\n') bazel_rc.write('build:windows --copt="/std:c++17"\n') - bazel_rc.write('build:windows --copt="/std:c++17"\n') # Config for CI and release build bazel_rc.write("build:optimization --copt=-msse4.2\n") bazel_rc.write("build:optimization --copt=-mavx\n")