Skip to content

Commit eddae8c

Browse files
LinGeLinyongtang
andauthored
updated arrow version to 7.0.0 (#1677)
* updated arrow version to 7.0.0 * Update arrow_dataset_ops.cc Co-authored-by: Yong Tang <yong.tang.github@outlook.com>
1 parent 5360168 commit eddae8c

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

WORKSPACE

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,11 @@ http_archive(
158158
http_archive(
159159
name = "arrow",
160160
build_file = "//third_party:arrow.BUILD",
161-
patch_cmds = [
162-
# TODO: Remove the fowllowing once arrow issue is resolved.
163-
"""sed -i.bak 's/type_traits/std::max<int16_t>(sizeof(int16_t), type_traits/g' cpp/src/parquet/column_reader.cc""",
164-
"""sed -i.bak 's/value_byte_size/value_byte_size)/g' cpp/src/parquet/column_reader.cc""",
165-
],
166-
sha256 = "a27971e2a71c412ae43d998b7b6d06201c7a3da382c804dcdc4a8126ccbabe67",
167-
strip_prefix = "arrow-apache-arrow-4.0.0",
161+
sha256 = "57e13c62f27b710e1de54fd30faed612aefa22aa41fa2c0c3bacd204dd18a8f3",
162+
strip_prefix = "arrow-apache-arrow-7.0.0",
168163
urls = [
169-
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/apache/arrow/archive/apache-arrow-4.0.0.tar.gz",
170-
"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",
171166
],
172167
)
173168

@@ -851,10 +846,10 @@ http_archive(
851846
http_archive(
852847
name = "xsimd",
853848
build_file = "//third_party:xsimd.BUILD",
854-
sha256 = "45337317c7f238fe0d64bb5d5418d264a427efc53400ddf8e6a964b6bcb31ce9",
855-
strip_prefix = "xsimd-7.5.0",
849+
sha256 = "21b4700e9ef70f6c9a86952047efd8272317df4e6fee35963de9394fd9c5677f",
850+
strip_prefix = "xsimd-8.0.1",
856851
urls = [
857-
"https://github.com/xtensor-stack/xsimd/archive/refs/tags/7.5.0.tar.gz",
852+
"https://github.com/xtensor-stack/xsimd/archive/refs/tags/8.0.1.tar.gz",
858853
],
859854
)
860855

tensorflow_io/core/kernels/arrow/arrow_dataset_ops.cc

Lines changed: 1 addition & 1 deletion
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

Lines changed: 9 additions & 5 deletions
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();

third_party/arrow.BUILD

Lines changed: 2 additions & 0 deletions
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/xsimd.BUILD

Lines changed: 2 additions & 0 deletions
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",

0 commit comments

Comments
 (0)