Skip to content

Commit 8e3a32f

Browse files
Merge branch 'tensorflow:master' into devel
2 parents eda1fa7 + deab3ce commit 8e3a32f

File tree

14 files changed

+74
-42
lines changed

14 files changed

+74
-42
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.1
1+
5.0.0

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ of releases [here](https://github.com/tensorflow/io/releases).
126126

127127
| TensorFlow I/O Version | TensorFlow Compatibility | Release Date |
128128
| --- | --- | --- |
129+
| 0.26.0 | 2.9.x | May 17, 2022 |
130+
| 0.25.0 | 2.8.x | Apr 19, 2022 |
129131
| 0.24.0 | 2.8.x | Feb 04, 2022 |
130132
| 0.23.1 | 2.7.x | Dec 15, 2021 |
131133
| 0.23.0 | 2.7.x | Dec 14, 2021 |

RELEASE.md

+30
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# Release 0.26.0
2+
3+
## Major Features and Bug Fixes
4+
* Updated arrow version to 7.0.0
5+
6+
## Thanks to our Contributors
7+
8+
This release contains contributions from many people:
9+
10+
372046933, Colin, Yong Tang
11+
12+
We are also grateful to all who filed issues or helped resolve them, asked and
13+
answered questions, and were part of inspiring discussions.
14+
15+
# Release 0.25.0
16+
17+
## Major Features and Bug Fixes
18+
* Decrease max bytes read from hdfs
19+
* Hide mongodb connection uri from being logged
20+
* Update log level from fetal to error when loading the libhdfs.so failed
21+
22+
## Thanks to our Contributors
23+
24+
This release contains contributions from many people:
25+
26+
Junfan Zhang, Stan Chen, Vignesh Kothapalli, Yong Tang, trabenx, yleeeee
27+
28+
We are also grateful to all who filed issues or helped resolve them, asked and
29+
answered questions, and were part of inspiring discussions.
30+
131
# Release 0.24.0
232

333
## Major Features and Bug Fixes

WORKSPACE

+18-22
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
66
http_archive(
77
name = "zlib",
88
build_file = "//third_party:zlib.BUILD",
9-
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
10-
strip_prefix = "zlib-1.2.11",
9+
patch_cmds = ["""sed -i.bak '29i\\'$'\\n#include<zconf.h>\\n' contrib/minizip/crypt.h"""],
10+
sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9",
11+
strip_prefix = "zlib-1.2.12",
1112
urls = [
12-
"https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.11.tar.gz",
13-
"https://zlib.net/zlib-1.2.11.tar.gz",
13+
"https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.12.tar.gz",
14+
"https://zlib.net/zlib-1.2.12.tar.gz",
1415
],
1516
)
1617

@@ -114,10 +115,10 @@ pip_install()
114115

115116
http_archive(
116117
name = "org_tensorflow",
117-
sha256 = "66b953ae7fba61fd78969a2e24e350b26ec116cf2e6a7eb93d02c63939c6f9f7",
118-
strip_prefix = "tensorflow-2.8.0",
118+
sha256 = "8087cb0c529f04a4bfe480e49925cd64a904ad16d8ec66b98e2aacdfd53c80ff",
119+
strip_prefix = "tensorflow-2.9.0",
119120
urls = [
120-
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.8.0.tar.gz",
121+
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.9.0.tar.gz",
121122
],
122123
)
123124

@@ -157,16 +158,11 @@ http_archive(
157158
http_archive(
158159
name = "arrow",
159160
build_file = "//third_party:arrow.BUILD",
160-
patch_cmds = [
161-
# TODO: Remove the fowllowing once arrow issue is resolved.
162-
"""sed -i.bak 's/type_traits/std::max<int16_t>(sizeof(int16_t), type_traits/g' cpp/src/parquet/column_reader.cc""",
163-
"""sed -i.bak 's/value_byte_size/value_byte_size)/g' cpp/src/parquet/column_reader.cc""",
164-
],
165-
sha256 = "a27971e2a71c412ae43d998b7b6d06201c7a3da382c804dcdc4a8126ccbabe67",
166-
strip_prefix = "arrow-apache-arrow-4.0.0",
161+
sha256 = "57e13c62f27b710e1de54fd30faed612aefa22aa41fa2c0c3bacd204dd18a8f3",
162+
strip_prefix = "arrow-apache-arrow-7.0.0",
167163
urls = [
168-
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/apache/arrow/archive/apache-arrow-4.0.0.tar.gz",
169-
"https://github.com/apache/arrow/archive/apache-arrow-4.0.0.tar.gz",
164+
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/apache/arrow/archive/apache-arrow-7.0.0.tar.gz",
165+
"https://github.com/apache/arrow/archive/apache-arrow-7.0.0.tar.gz",
170166
],
171167
)
172168

@@ -601,10 +597,10 @@ http_archive(
601597
patch_cmds = [
602598
"tar -xzf c++/libs/libhdfspp/libhdfspp.tar.gz -C c++/libs/libhdfspp",
603599
],
604-
sha256 = "abdffe48b8d2e7776c3b541ee2241401e49774941ca4a8c759e5d795daec8a45",
605-
strip_prefix = "orc-rel-release-1.6.7",
600+
sha256 = "39d983f4c7feb8ea1e8ab8e3e53e9afc643282b7a500b3a93c91aa6490f65c17",
601+
strip_prefix = "orc-rel-release-1.6.14",
606602
urls = [
607-
"https://github.com/apache/orc/archive/refs/tags/rel/release-1.6.7.tar.gz",
603+
"https://github.com/apache/orc/archive/refs/tags/rel/release-1.6.14.tar.gz",
608604
],
609605
)
610606

@@ -861,10 +857,10 @@ http_archive(
861857
http_archive(
862858
name = "xsimd",
863859
build_file = "//third_party:xsimd.BUILD",
864-
sha256 = "45337317c7f238fe0d64bb5d5418d264a427efc53400ddf8e6a964b6bcb31ce9",
865-
strip_prefix = "xsimd-7.5.0",
860+
sha256 = "21b4700e9ef70f6c9a86952047efd8272317df4e6fee35963de9394fd9c5677f",
861+
strip_prefix = "xsimd-8.0.1",
866862
urls = [
867-
"https://github.com/xtensor-stack/xsimd/archive/refs/tags/7.5.0.tar.gz",
863+
"https://github.com/xtensor-stack/xsimd/archive/refs/tags/8.0.1.tar.gz",
868864
],
869865
)
870866

tensorflow_io/core/filesystems/hdfs/hadoop_filesystem.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class LibHDFS {
241241
if (TF_GetCode(status) == TF_OK) {
242242
return;
243243
} else {
244-
TF_Log(TF_FATAL, "HadoopFileSystem load error: %s", TF_Message(status));
244+
TF_Log(TF_ERROR, "HadoopFileSystem load error: %s", TF_Message(status));
245245
}
246246
}
247247

tensorflow_io/core/kernels/arrow/arrow_dataset_ops.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ limitations under the License.
1414
==============================================================================*/
1515

1616
#include "arrow/api.h"
17+
#include "arrow/io/stdio.h"
1718
#include "arrow/ipc/api.h"
1819
#include "arrow/result.h"
19-
#include "arrow/util/io_util.h"
2020
#include "tensorflow/core/framework/dataset.h"
2121
#include "tensorflow/core/graph/graph.h"
2222
#include "tensorflow/core/public/version.h"

tensorflow_io/core/kernels/json_kernels.cc

+9-5
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,20 @@ class JSONReadable : public IOReadableInterface {
107107

108108
::arrow::Status status;
109109

110-
status = ::arrow::json::TableReader::Make(
110+
auto reader_result = ::arrow::json::TableReader::Make(
111111
::arrow::default_memory_pool(), json_file_,
112112
::arrow::json::ReadOptions::Defaults(),
113-
::arrow::json::ParseOptions::Defaults(), &reader_);
114-
if (!status.ok()) {
113+
::arrow::json::ParseOptions::Defaults());
114+
if (!reader_result.ok()) {
115115
return errors::InvalidArgument("unable to make a TableReader: ", status);
116+
} else {
117+
reader_ = reader_result.ValueOrDie();
116118
}
117-
status = reader_->Read(&table_);
118-
if (!status.ok()) {
119+
auto table_result = reader_->Read();
120+
if (!table_result.ok()) {
119121
return errors::InvalidArgument("unable to read table: ", status);
122+
} else {
123+
table_ = table_result.ValueOrDie();
120124
}
121125

122126
shapes_.clear();

tensorflow_io/core/kernels/mongodb_kernels.cc

+2-8
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class MongoDBReadableResource : public ResourceBase {
3939
// Required to initialize libmongoc's internals
4040
mongoc_init();
4141

42-
// Log the uri
43-
LOG(INFO) << "Connecting to: " << uri;
44-
4542
// Create a MongoDB URI object from the given string
4643

4744
uri_obj_ = mongoc_uri_new_with_error(uri.c_str(), &error_);
@@ -128,7 +125,7 @@ class MongoDBReadableResource : public ResourceBase {
128125
return errors::FailedPrecondition(
129126
"Failed to ping the mongo cluster due to: ", error_.message);
130127
}
131-
LOG(ERROR) << "Ping Successful";
128+
LOG(INFO) << "MongoDB connection ping successful";
132129

133130
return Status::OK();
134131
}
@@ -222,9 +219,6 @@ class MongoDBWritableResource : public ResourceBase {
222219
// Required to initialize libmongoc's internals
223220
mongoc_init();
224221

225-
// Log the uri
226-
LOG(INFO) << "Connecting to: " << uri;
227-
228222
// Create a MongoDB URI object from the given string
229223

230224
uri_obj_ = mongoc_uri_new_with_error(uri.c_str(), &error_);
@@ -308,7 +302,7 @@ class MongoDBWritableResource : public ResourceBase {
308302
return errors::FailedPrecondition(
309303
"Failed to ping the mongo cluster due to: ", error_.message);
310304
}
311-
LOG(INFO) << "Ping Successful";
305+
LOG(INFO) << "MongoDB connection ping successful";
312306

313307
return Status::OK();
314308
}

tensorflow_io/python/experimental/filter_ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
def pad(input, ksize, mode, constant_values):
2323
input = tf.convert_to_tensor(input)
2424
ksize = tf.convert_to_tensor(ksize)
25-
mode = "CONSTANT" if mode is None else upper(mode)
25+
mode = "CONSTANT" if mode is None else str.upper(mode)
2626
constant_values = (
2727
tf.zeros([], dtype=input.dtype)
2828
if constant_values is None

tensorflow_io/python/ops/version_ops.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# ==============================================================================
1515
"""version_ops"""
1616

17-
version = "0.24.0"
18-
require = "tensorflow>=2.8.0,<2.9.0"
17+
version = "0.26.0"
18+
require = "tensorflow>=2.9.0,<2.10.0"

third_party/arrow.BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ cc_library(
8484
"cpp/src/**/stream_to_file.cc",
8585
"cpp/src/arrow/util/bpacking_avx2.cc",
8686
"cpp/src/arrow/util/bpacking_avx512.cc",
87+
"cpp/src/arrow/util/bpacking_neon.cc",
88+
"cpp/src/arrow/util/tracing_internal.cc",
8789
],
8890
),
8991
hdrs = [

third_party/liborc.BUILD

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ genrule(
9292
srcs = ["c++/include/orc/orc-config.hh.in"],
9393
outs = ["c++/include/orc/orc-config.hh"],
9494
cmd = ("sed " +
95-
"-e 's/@ORC_VERSION@/1.6.7/g' " +
95+
"-e 's/@ORC_VERSION@/1.6.14/g' " +
9696
"-e 's/cmakedefine/define/g' " +
9797
"$< >$@"),
9898
)
@@ -107,6 +107,7 @@ genrule(
107107
"-e 's/cmakedefine HAS_PREAD/undef HAS_PREAD/g' " +
108108
"-e 's/cmakedefine NEEDS_REDUNDANT_MOVE/undef NEEDS_REDUNDANT_MOVE/g' " +
109109
"-e 's/cmakedefine NEEDS_Z_PREFIX/undef NEEDS_Z_PREFIX/g' " +
110+
"-e 's/cmakedefine HAS_BUILTIN_OVERFLOW_CHECK/undef HAS_BUILTIN_OVERFLOW_CHECK/g' " +
110111
"-e 's/cmakedefine/define/g' " +
111112
"$< >$@"
112113
),

third_party/xsimd.BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ cc_library(
1010
hdrs = glob(
1111
[
1212
"include/xsimd/*.hpp",
13+
"include/xsimd/arch/*.hpp",
14+
"include/xsimd/arch/generic/*.hpp",
1315
"include/xsimd/config/*.hpp",
1416
"include/xsimd/math/*.hpp",
1517
"include/xsimd/memory/*.hpp",

tools/release/note_update.py

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
).stdout.decode("utf-8")
5656

5757
authors = [e.split("\t")[1].strip() for e in logs.rstrip().split("\n")]
58+
authors = list(filter(lambda e: e != "github-actions[bot]", authors))
5859
# Replace " " with "@" to allow text wrap without break names, then replace back
5960
authors = textwrap.fill(", ".join([e.replace(" ", "@") for e in authors]), 80).replace(
6061
"@", " "

0 commit comments

Comments
 (0)