Skip to content

Commit 152457a

Browse files
authored
Bump tensorflow to 2.10rc2 and various fixes. (#1706)
* Bump tensorflow to 2.10rc2 and various fixes. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Update configure.py Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
1 parent 99dc826 commit 152457a

File tree

8 files changed

+41
-32
lines changed

8 files changed

+41
-32
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0
1+
5.1.1

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ pip_install()
115115

116116
http_archive(
117117
name = "org_tensorflow",
118-
sha256 = "8087cb0c529f04a4bfe480e49925cd64a904ad16d8ec66b98e2aacdfd53c80ff",
119-
strip_prefix = "tensorflow-2.9.0",
118+
sha256 = "7edd8b544cc65254735210e03364fe9828f36430e09e9322fba9b0a4b2912580",
119+
strip_prefix = "tensorflow-2.10.0-rc2",
120120
urls = [
121-
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.9.0.tar.gz",
121+
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.10.0-rc2.tar.gz",
122122
],
123123
)
124124

tensorflow_io/python/ops/version_ops.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# ==============================================================================
1515
"""version_ops"""
1616

17-
version = "0.26.0"
18-
require = "tensorflow>=2.9.0,<2.10.0"
17+
version = "0.27.0"
18+
require = "tensorflow>=2.10.0rc2,<2.11.0"

third_party/arrow.BUILD

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,6 @@ licenses(["notice"]) # Apache 2.0
77

88
exports_files(["LICENSE.txt"])
99

10-
load("@flatbuffers//:build_defs.bzl", "flatbuffer_cc_library")
11-
12-
flatbuffer_cc_library(
13-
name = "arrow_format",
14-
srcs = [
15-
"cpp/src/arrow/ipc/feather.fbs",
16-
"format/File.fbs",
17-
"format/Message.fbs",
18-
"format/Schema.fbs",
19-
"format/SparseTensor.fbs",
20-
"format/Tensor.fbs",
21-
],
22-
flatc_args = [
23-
"--scoped-enums",
24-
"--gen-object-api",
25-
],
26-
out_prefix = "cpp/src/generated/",
27-
)
28-
2910
genrule(
3011
name = "arrow_util_config",
3112
srcs = ["cpp/src/arrow/util/config.h.cmake"],
@@ -62,7 +43,6 @@ cc_library(
6243
"cpp/src/arrow/json/*.cc",
6344
"cpp/src/arrow/tensor/*.cc",
6445
"cpp/src/arrow/util/*.cc",
65-
"cpp/src/arrow/vendored/musl/strptime.c",
6646
"cpp/src/arrow/vendored/optional.hpp",
6747
"cpp/src/arrow/vendored/string_view.hpp",
6848
"cpp/src/arrow/vendored/variant.hpp",
@@ -71,6 +51,7 @@ cc_library(
7151
"cpp/src/parquet/**/*.cc",
7252
"cpp/src/generated/*.h",
7353
"cpp/src/generated/*.cpp",
54+
"cpp/thirdparty/flatbuffers/include/flatbuffers/*.h",
7455
],
7556
exclude = [
7657
"cpp/src/**/*_benchmark.cc",
@@ -87,13 +68,25 @@ cc_library(
8768
"cpp/src/arrow/util/bpacking_neon.cc",
8869
"cpp/src/arrow/util/tracing_internal.cc",
8970
],
90-
),
71+
) + select({
72+
"@bazel_tools//src/conditions:windows": [
73+
"cpp/src/arrow/vendored/musl/strptime.c",
74+
],
75+
"//conditions:default": [],
76+
}),
9177
hdrs = [
9278
# declare header from above genrule
9379
"cpp/src/arrow/util/config.h",
9480
"cpp/src/parquet/parquet_version.h",
9581
],
96-
copts = [],
82+
copts = select({
83+
"@bazel_tools//src/conditions:windows": [
84+
"/std:c++14",
85+
],
86+
"//conditions:default": [
87+
"-std=c++14",
88+
],
89+
}),
9790
defines = [
9891
"ARROW_WITH_BROTLI",
9992
"ARROW_WITH_SNAPPY",
@@ -110,12 +103,12 @@ cc_library(
110103
includes = [
111104
"cpp/src",
112105
"cpp/src/arrow/vendored/xxhash",
106+
"cpp/thirdparty/flatbuffers/include",
113107
],
114108
textual_hdrs = [
115109
"cpp/src/arrow/vendored/xxhash/xxhash.c",
116110
],
117111
deps = [
118-
":arrow_format",
119112
"@boringssl//:crypto",
120113
"@brotli",
121114
"@bzip2",

third_party/fmjpeg2koj.BUILD

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ cc_library(
1212
"*.cc",
1313
"*.cpp",
1414
]),
15+
copts = select({
16+
"@bazel_tools//src/conditions:windows": [],
17+
"//conditions:default": [
18+
"-Wno-register",
19+
"-Wno-error",
20+
],
21+
}),
1522
includes = [
1623
"include",
1724
],

third_party/libmemcached.BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ cc_library(
2222
"config/libhashkit/hashkitcon.h",
2323
"config/mem_config.h",
2424
],
25-
copts = [],
25+
copts = [
26+
"-Wno-register",
27+
"-Wno-error",
28+
],
2629
includes = [
2730
".",
2831
"config",

third_party/openexr.BUILD

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ cc_library(
2929
"config/OpenEXRConfigInternal.h",
3030
],
3131
hdrs = [],
32-
copts = [],
32+
copts = select({
33+
"@bazel_tools//src/conditions:windows": [
34+
"/std:c++14",
35+
],
36+
"//conditions:default": [],
37+
}),
3338
defines = select({
3439
"@bazel_tools//src/conditions:darwin": [],
3540
"@bazel_tools//src/conditions:windows": [],

tools/build/configure.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def write_config():
101101
bazel_rc.write(
102102
f'build --action_env TF_SHARED_LIBRARY_NAME="{library_name}"\n'
103103
)
104-
bazel_rc.write('build --cxxopt="-std=c++14"\n')
104+
bazel_rc.write('build --cxxopt="-std=c++17"\n')
105105
for argv in sys.argv[1:]:
106106
if argv == "--cuda":
107107
bazel_rc.write('build --action_env TF_NEED_CUDA="1"\n')
@@ -126,6 +126,7 @@ def write_config():
126126
bazel_rc.write("build:macos --copt=-Wunguarded-availability\n")
127127
# MSVC (Windows): Standards-conformant preprocessor mode
128128
bazel_rc.write('build:windows --copt="/Zc:preprocessor"\n')
129+
bazel_rc.write('build:windows --copt="/std:c++17"\n')
129130
# Config for CI and release build
130131
bazel_rc.write("build:optimization --copt=-msse4.2\n")
131132
bazel_rc.write("build:optimization --copt=-mavx\n")

0 commit comments

Comments
 (0)