From 2c8f33caac9c6c688ee7eb625db476cf4a0af32f Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Wed, 2 Nov 2022 17:41:57 +0000 Subject: [PATCH 1/5] Bump tensorflow to 2.11rc2 Signed-off-by: Yong Tang --- WORKSPACE | 6 +++--- tensorflow_io/python/ops/version_ops.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index d82a12334..105fc6291 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -115,10 +115,10 @@ pip_install() http_archive( name = "org_tensorflow", - sha256 = "b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8", - strip_prefix = "tensorflow-2.10.0", + sha256 = "1b1abbc014973322ce6dd235cce8d1ba9df05fccd78e9fc762e0f8344aa21e99", + strip_prefix = "tensorflow-2.11.0-rc2", urls = [ - "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.10.0.tar.gz", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0-rc2.tar.gz", ], ) diff --git a/tensorflow_io/python/ops/version_ops.py b/tensorflow_io/python/ops/version_ops.py index 0e7d90cb9..fd008f4b9 100644 --- a/tensorflow_io/python/ops/version_ops.py +++ b/tensorflow_io/python/ops/version_ops.py @@ -15,4 +15,4 @@ """version_ops""" version = "0.27.0" -require = "tensorflow>=2.10.0,<2.11.0" +require = "tensorflow>=2.11.0rc2,<2.12.0" From e8d2060cb0594cf025aa306fa95cef2b92cc3062 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 4 Nov 2022 23:28:18 +0000 Subject: [PATCH 2/5] Update Signed-off-by: Yong Tang blocking_counter Signed-off-by: Yong Tang --- WORKSPACE | 8 ++++---- tensorflow_io/core/kernels/avro/parse_avro_kernels.cc | 2 +- third_party/toolchains/tf/BUILD.tpl | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 105fc6291..42c3ae31f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -7,11 +7,11 @@ http_archive( name = "zlib", build_file = "//third_party:zlib.BUILD", patch_cmds = ["""sed -i.bak '29i\\'$'\\n#include\\n' contrib/minizip/crypt.h"""], - sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9", - strip_prefix = "zlib-1.2.12", + sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", + strip_prefix = "zlib-1.2.13", urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.12.tar.gz", - "https://zlib.net/zlib-1.2.12.tar.gz", + "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.13.tar.gz", + "https://zlib.net/zlib-1.2.13.tar.gz", ], ) diff --git a/tensorflow_io/core/kernels/avro/parse_avro_kernels.cc b/tensorflow_io/core/kernels/avro/parse_avro_kernels.cc index 156d6c490..e0e02fdc6 100644 --- a/tensorflow_io/core/kernels/avro/parse_avro_kernels.cc +++ b/tensorflow_io/core/kernels/avro/parse_avro_kernels.cc @@ -18,9 +18,9 @@ limitations under the License. #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor_util.h" -#include "tensorflow/core/lib/core/blocking_counter.h" #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/lib/gtl/array_slice.h" +#include "tensorflow/core/platform/blocking_counter.h" #include "tensorflow_io/core/kernels/avro/utils/avro_parser_tree.h" namespace tensorflow { diff --git a/third_party/toolchains/tf/BUILD.tpl b/third_party/toolchains/tf/BUILD.tpl index 03935e80e..d90c2886a 100644 --- a/third_party/toolchains/tf/BUILD.tpl +++ b/third_party/toolchains/tf/BUILD.tpl @@ -9,6 +9,7 @@ cc_library( "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/container:inlined_vector", + "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:cord", "@com_google_absl//absl/types:optional", From ea36d1fefc0f06721a79276d7d29ee647707bf03 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 18 Nov 2022 09:20:36 -0800 Subject: [PATCH 3/5] Bump to 2.11 Signed-off-by: Yong Tang --- WORKSPACE | 6 +++--- tensorflow_io/python/ops/version_ops.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 42c3ae31f..66edd1c19 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -115,10 +115,10 @@ pip_install() http_archive( name = "org_tensorflow", - sha256 = "1b1abbc014973322ce6dd235cce8d1ba9df05fccd78e9fc762e0f8344aa21e99", - strip_prefix = "tensorflow-2.11.0-rc2", + sha256 = "99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48", + strip_prefix = "tensorflow-2.11.0", urls = [ - "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0-rc2.tar.gz", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0.tar.gz", ], ) diff --git a/tensorflow_io/python/ops/version_ops.py b/tensorflow_io/python/ops/version_ops.py index fd008f4b9..800328cf2 100644 --- a/tensorflow_io/python/ops/version_ops.py +++ b/tensorflow_io/python/ops/version_ops.py @@ -15,4 +15,4 @@ """version_ops""" version = "0.27.0" -require = "tensorflow>=2.11.0rc2,<2.12.0" +require = "tensorflow>=2.11.0,<2.12.0" From d0408430be5a8382bc0a5c33f063c6d82058d12f Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 19 Nov 2022 05:33:48 -0800 Subject: [PATCH 4/5] Disable oss on windows Signed-off-by: Yong Tang --- tensorflow_io/core/filesystems/BUILD | 8 ++++++-- tensorflow_io/core/filesystems/filesystem_plugins.cc | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tensorflow_io/core/filesystems/BUILD b/tensorflow_io/core/filesystems/BUILD index b49a3885e..9276208fd 100644 --- a/tensorflow_io/core/filesystems/BUILD +++ b/tensorflow_io/core/filesystems/BUILD @@ -38,8 +38,12 @@ cc_library( "//tensorflow_io/core/filesystems/az", "//tensorflow_io/core/filesystems/hdfs", "//tensorflow_io/core/filesystems/http", - "//tensorflow_io/core/filesystems/oss", "//tensorflow_io/core/filesystems/s3", - ], + ] + select({ + "@bazel_tools//src/conditions:windows": [], + "//conditions:default": [ + "//tensorflow_io/core/filesystems/oss", + ], + }), alwayslink = 1, ) diff --git a/tensorflow_io/core/filesystems/filesystem_plugins.cc b/tensorflow_io/core/filesystems/filesystem_plugins.cc index 5d059bd5b..1f0f6cab2 100644 --- a/tensorflow_io/core/filesystems/filesystem_plugins.cc +++ b/tensorflow_io/core/filesystems/filesystem_plugins.cc @@ -29,7 +29,10 @@ limitations under the License. TFIO_PLUGIN_EXPORT void TF_InitPlugin(TF_FilesystemPluginInfo* info) { info->plugin_memory_allocate = tensorflow::io::plugin_memory_allocate; info->plugin_memory_free = tensorflow::io::plugin_memory_free; + info->num_schemes = 7; +#if !defined(_MSC_VER) info->num_schemes = 8; +#endif info->ops = static_cast( tensorflow::io::plugin_memory_allocate(info->num_schemes * sizeof(info->ops[0]))); @@ -40,5 +43,7 @@ TFIO_PLUGIN_EXPORT void TF_InitPlugin(TF_FilesystemPluginInfo* info) { tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[4], "hdfs"); tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[5], "viewfs"); tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[6], "har"); +#if !defined(_MSC_VER) tensorflow::io::oss::ProvideFilesystemSupportFor(&info->ops[7], "oss"); +#endif } From c95b3f130de1b6705c803f73970892e755f8ee65 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 19 Nov 2022 18:44:07 -0800 Subject: [PATCH 5/5] Add python 3.11 Signed-off-by: Yong Tang --- .github/workflows/build.yml | 45 ++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0b452230..016cdeb98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,7 +138,7 @@ jobs: runs-on: macOS-11 strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v1 @@ -252,7 +252,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v1 @@ -365,7 +365,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v1 @@ -468,6 +468,10 @@ jobs: with: name: macOS-3.10-wheel path: macOS-3.10-wheel + - uses: actions/download-artifact@v1 + with: + name: macOS-3.11-wheel + path: macOS-3.11-wheel - uses: actions/download-artifact@v1 with: name: Linux-3.7-wheel @@ -484,6 +488,10 @@ jobs: with: name: Linux-3.10-wheel path: Linux-3.10-wheel + - uses: actions/download-artifact@v1 + with: + name: Linux-3.11-wheel + path: Linux-3.11-wheel - uses: actions/download-artifact@v1 with: name: Windows-3.7-wheel @@ -500,6 +508,10 @@ jobs: with: name: Windows-3.10-wheel path: Windows-3.10-wheel + - uses: actions/download-artifact@v1 + with: + name: Windows-3.11-wheel + path: Windows-3.11-wheel - run: | set -e -x mkdir -p wheelhouse @@ -507,14 +519,17 @@ jobs: cp macOS-3.8-wheel/*.whl wheelhouse/ cp macOS-3.9-wheel/*.whl wheelhouse/ cp macOS-3.10-wheel/*.whl wheelhouse/ + cp macOS-3.11-wheel/*.whl wheelhouse/ cp Linux-3.7-wheel/*.whl wheelhouse/ cp Linux-3.8-wheel/*.whl wheelhouse/ cp Linux-3.9-wheel/*.whl wheelhouse/ cp Linux-3.10-wheel/*.whl wheelhouse/ + cp Linux-3.11-wheel/*.whl wheelhouse/ cp Windows-3.7-wheel/*.whl wheelhouse/ cp Windows-3.8-wheel/*.whl wheelhouse/ cp Windows-3.9-wheel/*.whl wheelhouse/ cp Windows-3.10-wheel/*.whl wheelhouse/ + cp Windows-3.11-wheel/*.whl wheelhouse/ ls -la wheelhouse/ sha256sum wheelhouse/*.whl - uses: actions/upload-artifact@v2 @@ -605,7 +620,7 @@ jobs: runs-on: macOS-11 strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/download-artifact@v1 with: @@ -652,7 +667,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/download-artifact@v1 with: @@ -692,7 +707,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python: ['3.7', '3.8', '3.9', '3.10'] + python: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/download-artifact@v1 with: @@ -744,6 +759,10 @@ jobs: with: name: macOS-3.10-nightly path: macOS-3.10-nightly + - uses: actions/download-artifact@v1 + with: + name: macOS-3.11-nightly + path: macOS-3.11-nightly - uses: actions/download-artifact@v1 with: name: Linux-3.7-nightly @@ -760,6 +779,10 @@ jobs: with: name: Linux-3.10-nightly path: Linux-3.10-nightly + - uses: actions/download-artifact@v1 + with: + name: Linux-3.11-nightly + path: Linux-3.11-nightly - uses: actions/download-artifact@v1 with: name: Windows-3.7-nightly @@ -776,6 +799,10 @@ jobs: with: name: Windows-3.10-nightly path: Windows-3.10-nightly + - uses: actions/download-artifact@v1 + with: + name: Windows-3.11-nightly + path: Windows-3.11-nightly - run: | set -e -x mkdir -p dist @@ -783,14 +810,17 @@ jobs: cp macOS-3.8-nightly/tensorflow_io_nightly*.whl dist/ cp macOS-3.9-nightly/tensorflow_io_nightly*.whl dist/ cp macOS-3.10-nightly/tensorflow_io_nightly*.whl dist/ + cp macOS-3.11-nightly/tensorflow_io_nightly*.whl dist/ cp Linux-3.7-nightly/tensorflow_io_nightly*.whl dist/ cp Linux-3.8-nightly/tensorflow_io_nightly*.whl dist/ cp Linux-3.9-nightly/tensorflow_io_nightly*.whl dist/ cp Linux-3.10-nightly/tensorflow_io_nightly*.whl dist/ + cp Linux-3.11-nightly/tensorflow_io_nightly*.whl dist/ cp Windows-3.7-nightly/tensorflow_io_nightly*.whl dist/ cp Windows-3.8-nightly/tensorflow_io_nightly*.whl dist/ cp Windows-3.9-nightly/tensorflow_io_nightly*.whl dist/ cp Windows-3.10-nightly/tensorflow_io_nightly*.whl dist/ + cp Windows-3.11-nightly/tensorflow_io_nightly*.whl dist/ ls -la dist/ sha256sum dist/*.whl - uses: pypa/gh-action-pypi-publish@master @@ -805,14 +835,17 @@ jobs: cp macOS-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp macOS-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp macOS-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ + cp macOS-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Linux-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Linux-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Linux-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Linux-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ + cp Linux-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Windows-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Windows-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Windows-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ cp Windows-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ + cp Windows-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/ ls -la dist/ sha256sum dist/*.whl - uses: pypa/gh-action-pypi-publish@master