Skip to content

Commit 43403c6

Browse files
yongtangyongtang
authored
Bump tensorflow to 2.11rc2 (#1729)
* Bump tensorflow to 2.11rc2 Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Update Signed-off-by: Yong Tang <yong.tang.github@outlook.com> blocking_counter Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Bump to 2.11 Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Disable oss on windows Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Add python 3.11 Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
1 parent f919434 commit 43403c6

File tree

7 files changed

+60
-17
lines changed

7 files changed

+60
-17
lines changed

‎.github/workflows/build.yml‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
runs-on: macOS-11
139139
strategy:
140140
matrix:
141-
python: ['3.7', '3.8', '3.9', '3.10']
141+
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
142142
steps:
143143
- uses: actions/checkout@v2
144144
- uses: actions/download-artifact@v1
@@ -252,7 +252,7 @@ jobs:
252252
runs-on: ubuntu-20.04
253253
strategy:
254254
matrix:
255-
python: ['3.7', '3.8', '3.9', '3.10']
255+
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
256256
steps:
257257
- uses: actions/checkout@v2
258258
- uses: actions/download-artifact@v1
@@ -365,7 +365,7 @@ jobs:
365365
runs-on: windows-latest
366366
strategy:
367367
matrix:
368-
python: ['3.7', '3.8', '3.9', '3.10']
368+
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
369369
steps:
370370
- uses: actions/checkout@v2
371371
- uses: actions/download-artifact@v1
@@ -468,6 +468,10 @@ jobs:
468468
with:
469469
name: macOS-3.10-wheel
470470
path: macOS-3.10-wheel
471+
- uses: actions/download-artifact@v1
472+
with:
473+
name: macOS-3.11-wheel
474+
path: macOS-3.11-wheel
471475
- uses: actions/download-artifact@v1
472476
with:
473477
name: Linux-3.7-wheel
@@ -484,6 +488,10 @@ jobs:
484488
with:
485489
name: Linux-3.10-wheel
486490
path: Linux-3.10-wheel
491+
- uses: actions/download-artifact@v1
492+
with:
493+
name: Linux-3.11-wheel
494+
path: Linux-3.11-wheel
487495
- uses: actions/download-artifact@v1
488496
with:
489497
name: Windows-3.7-wheel
@@ -500,21 +508,28 @@ jobs:
500508
with:
501509
name: Windows-3.10-wheel
502510
path: Windows-3.10-wheel
511+
- uses: actions/download-artifact@v1
512+
with:
513+
name: Windows-3.11-wheel
514+
path: Windows-3.11-wheel
503515
- run: |
504516
set -e -x
505517
mkdir -p wheelhouse
506518
cp macOS-3.7-wheel/*.whl wheelhouse/
507519
cp macOS-3.8-wheel/*.whl wheelhouse/
508520
cp macOS-3.9-wheel/*.whl wheelhouse/
509521
cp macOS-3.10-wheel/*.whl wheelhouse/
522+
cp macOS-3.11-wheel/*.whl wheelhouse/
510523
cp Linux-3.7-wheel/*.whl wheelhouse/
511524
cp Linux-3.8-wheel/*.whl wheelhouse/
512525
cp Linux-3.9-wheel/*.whl wheelhouse/
513526
cp Linux-3.10-wheel/*.whl wheelhouse/
527+
cp Linux-3.11-wheel/*.whl wheelhouse/
514528
cp Windows-3.7-wheel/*.whl wheelhouse/
515529
cp Windows-3.8-wheel/*.whl wheelhouse/
516530
cp Windows-3.9-wheel/*.whl wheelhouse/
517531
cp Windows-3.10-wheel/*.whl wheelhouse/
532+
cp Windows-3.11-wheel/*.whl wheelhouse/
518533
ls -la wheelhouse/
519534
sha256sum wheelhouse/*.whl
520535
- uses: actions/upload-artifact@v2
@@ -605,7 +620,7 @@ jobs:
605620
runs-on: macOS-11
606621
strategy:
607622
matrix:
608-
python: ['3.7', '3.8', '3.9', '3.10']
623+
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
609624
steps:
610625
- uses: actions/download-artifact@v1
611626
with:
@@ -652,7 +667,7 @@ jobs:
652667
runs-on: ubuntu-20.04
653668
strategy:
654669
matrix:
655-
python: ['3.7', '3.8', '3.9', '3.10']
670+
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
656671
steps:
657672
- uses: actions/download-artifact@v1
658673
with:
@@ -692,7 +707,7 @@ jobs:
692707
runs-on: windows-latest
693708
strategy:
694709
matrix:
695-
python: ['3.7', '3.8', '3.9', '3.10']
710+
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
696711
steps:
697712
- uses: actions/download-artifact@v1
698713
with:
@@ -744,6 +759,10 @@ jobs:
744759
with:
745760
name: macOS-3.10-nightly
746761
path: macOS-3.10-nightly
762+
- uses: actions/download-artifact@v1
763+
with:
764+
name: macOS-3.11-nightly
765+
path: macOS-3.11-nightly
747766
- uses: actions/download-artifact@v1
748767
with:
749768
name: Linux-3.7-nightly
@@ -760,6 +779,10 @@ jobs:
760779
with:
761780
name: Linux-3.10-nightly
762781
path: Linux-3.10-nightly
782+
- uses: actions/download-artifact@v1
783+
with:
784+
name: Linux-3.11-nightly
785+
path: Linux-3.11-nightly
763786
- uses: actions/download-artifact@v1
764787
with:
765788
name: Windows-3.7-nightly
@@ -776,21 +799,28 @@ jobs:
776799
with:
777800
name: Windows-3.10-nightly
778801
path: Windows-3.10-nightly
802+
- uses: actions/download-artifact@v1
803+
with:
804+
name: Windows-3.11-nightly
805+
path: Windows-3.11-nightly
779806
- run: |
780807
set -e -x
781808
mkdir -p dist
782809
cp macOS-3.7-nightly/tensorflow_io_nightly*.whl dist/
783810
cp macOS-3.8-nightly/tensorflow_io_nightly*.whl dist/
784811
cp macOS-3.9-nightly/tensorflow_io_nightly*.whl dist/
785812
cp macOS-3.10-nightly/tensorflow_io_nightly*.whl dist/
813+
cp macOS-3.11-nightly/tensorflow_io_nightly*.whl dist/
786814
cp Linux-3.7-nightly/tensorflow_io_nightly*.whl dist/
787815
cp Linux-3.8-nightly/tensorflow_io_nightly*.whl dist/
788816
cp Linux-3.9-nightly/tensorflow_io_nightly*.whl dist/
789817
cp Linux-3.10-nightly/tensorflow_io_nightly*.whl dist/
818+
cp Linux-3.11-nightly/tensorflow_io_nightly*.whl dist/
790819
cp Windows-3.7-nightly/tensorflow_io_nightly*.whl dist/
791820
cp Windows-3.8-nightly/tensorflow_io_nightly*.whl dist/
792821
cp Windows-3.9-nightly/tensorflow_io_nightly*.whl dist/
793822
cp Windows-3.10-nightly/tensorflow_io_nightly*.whl dist/
823+
cp Windows-3.11-nightly/tensorflow_io_nightly*.whl dist/
794824
ls -la dist/
795825
sha256sum dist/*.whl
796826
- uses: pypa/gh-action-pypi-publish@master
@@ -805,14 +835,17 @@ jobs:
805835
cp macOS-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
806836
cp macOS-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
807837
cp macOS-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
838+
cp macOS-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
808839
cp Linux-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
809840
cp Linux-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
810841
cp Linux-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
811842
cp Linux-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
843+
cp Linux-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
812844
cp Windows-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
813845
cp Windows-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
814846
cp Windows-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
815847
cp Windows-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
848+
cp Windows-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
816849
ls -la dist/
817850
sha256sum dist/*.whl
818851
- uses: pypa/gh-action-pypi-publish@master

‎WORKSPACE‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ http_archive(
77
name = "zlib",
88
build_file = "//third_party:zlib.BUILD",
99
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",
10+
sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30",
11+
strip_prefix = "zlib-1.2.13",
1212
urls = [
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",
13+
"https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.13.tar.gz",
14+
"https://zlib.net/zlib-1.2.13.tar.gz",
1515
],
1616
)
1717

@@ -115,10 +115,10 @@ pip_install()
115115

116116
http_archive(
117117
name = "org_tensorflow",
118-
sha256 = "b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8",
119-
strip_prefix = "tensorflow-2.10.0",
118+
sha256 = "99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48",
119+
strip_prefix = "tensorflow-2.11.0",
120120
urls = [
121-
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.10.0.tar.gz",
121+
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0.tar.gz",
122122
],
123123
)
124124

‎tensorflow_io/core/filesystems/BUILD‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ cc_library(
3838
"//tensorflow_io/core/filesystems/az",
3939
"//tensorflow_io/core/filesystems/hdfs",
4040
"//tensorflow_io/core/filesystems/http",
41-
"//tensorflow_io/core/filesystems/oss",
4241
"//tensorflow_io/core/filesystems/s3",
43-
],
42+
] + select({
43+
"@bazel_tools//src/conditions:windows": [],
44+
"//conditions:default": [
45+
"//tensorflow_io/core/filesystems/oss",
46+
],
47+
}),
4448
alwayslink = 1,
4549
)

‎tensorflow_io/core/filesystems/filesystem_plugins.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ limitations under the License.
2929
TFIO_PLUGIN_EXPORT void TF_InitPlugin(TF_FilesystemPluginInfo* info) {
3030
info->plugin_memory_allocate = tensorflow::io::plugin_memory_allocate;
3131
info->plugin_memory_free = tensorflow::io::plugin_memory_free;
32+
info->num_schemes = 7;
33+
#if !defined(_MSC_VER)
3234
info->num_schemes = 8;
35+
#endif
3336
info->ops = static_cast<TF_FilesystemPluginOps*>(
3437
tensorflow::io::plugin_memory_allocate(info->num_schemes *
3538
sizeof(info->ops[0])));
@@ -40,5 +43,7 @@ TFIO_PLUGIN_EXPORT void TF_InitPlugin(TF_FilesystemPluginInfo* info) {
4043
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[4], "hdfs");
4144
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[5], "viewfs");
4245
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[6], "har");
46+
#if !defined(_MSC_VER)
4347
tensorflow::io::oss::ProvideFilesystemSupportFor(&info->ops[7], "oss");
48+
#endif
4449
}

‎tensorflow_io/core/kernels/avro/parse_avro_kernels.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ limitations under the License.
1818
#include "tensorflow/core/framework/op_kernel.h"
1919
#include "tensorflow/core/framework/tensor.h"
2020
#include "tensorflow/core/framework/tensor_util.h"
21-
#include "tensorflow/core/lib/core/blocking_counter.h"
2221
#include "tensorflow/core/lib/core/threadpool.h"
2322
#include "tensorflow/core/lib/gtl/array_slice.h"
23+
#include "tensorflow/core/platform/blocking_counter.h"
2424
#include "tensorflow_io/core/kernels/avro/utils/avro_parser_tree.h"
2525

2626
namespace tensorflow {

‎tensorflow_io/python/ops/version_ops.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
"""version_ops"""
1616

1717
version = "0.27.0"
18-
require = "tensorflow>=2.10.0,<2.11.0"
18+
require = "tensorflow>=2.11.0,<2.12.0"

‎third_party/toolchains/tf/BUILD.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ cc_library(
99
"@com_google_absl//absl/container:flat_hash_map",
1010
"@com_google_absl//absl/container:flat_hash_set",
1111
"@com_google_absl//absl/container:inlined_vector",
12+
"@com_google_absl//absl/status",
1213
"@com_google_absl//absl/strings",
1314
"@com_google_absl//absl/strings:cord",
1415
"@com_google_absl//absl/types:optional",

0 commit comments

Comments
 (0)