Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes of v0.35 #24

Merged
merged 3 commits into from
Jan 8, 2024
Merged

Changes of v0.35 #24

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfb0025
Changes of v0.35
ArchanaShinde1 Dec 21, 2023
c64c5ae
fix build failure
cdeepali Dec 27, 2023
8e0ca21
Removed patch
ArchanaShinde1 Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 38 additions & 23 deletions recipe/0108-Fixed-upb.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5a61b66f64effbd8ba23d47be5b0e9541627611b Mon Sep 17 00:00:00 2001
From: Nishidha Panpaliya <[email protected].com>
Date: Thu, 10 Nov 2022 06:22:08 +0000
Subject: [PATCH] Fixed upb
From ba38899537e133a7efec0919e94e0eb70bf66fb9 Mon Sep 17 00:00:00 2001
From: Archana Shinde1 <archana.shinde2504@gmail.com>
Date: Wed, 20 Dec 2023 16:40:57 +0000
Subject: [PATCH] Fixed-upb

---
WORKSPACE | 12 +++++++++
Expand All @@ -10,13 +10,13 @@ Subject: [PATCH] Fixed upb
create mode 100644 third_party/upb_gcc10.patch

diff --git a/WORKSPACE b/WORKSPACE
index ed06afb9..1fd65ae9 100644
index c60b5d8f..d5641000 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,6 +15,18 @@ http_archive(
],
)

+http_archive(
+ name = "upb",
+ sha256 = "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
Expand All @@ -34,27 +34,41 @@ index ed06afb9..1fd65ae9 100644
name = "snappy",
diff --git a/third_party/upb_gcc10.patch b/third_party/upb_gcc10.patch
new file mode 100644
index 00000000..7d747c48
index 00000000..6fed76a0
--- /dev/null
+++ b/third_party/upb_gcc10.patch
@@ -0,0 +1,54 @@
+From 57028552ed072263cd6656e5feed67ff89a55e43 Mon Sep 17 00:00:00 2001
+From: Nishidha Panpaliya <npanpa23@in.ibm.com>
+Date: Mon, 7 Mar 2022 15:08:33 +0000
+Subject: [PATCH] Fix for build failure with GCC10
@@ -0,0 +1,68 @@
+From bf999f71058f05330f8dce75d2113770e7c580ca Mon Sep 17 00:00:00 2001
+From: Deepali Chourasia <deepch23@in.ibm.com>
+Date: Wed, 27 Dec 2023 07:42:32 +0000
+Subject: [PATCH] fix
+
+---
+ BUILD | 2 +-
+ upb/upb.c | 17 +++--------------
+ 1 file changed, 3 insertions(+), 14 deletions(-)
+ 2 files changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/BUILD b/BUILD
+index ad85b202..2311b2e4 100644
+--- a/BUILD
++++ b/BUILD
+@@ -44,7 +44,7 @@ config_setting(
+
+ config_setting(
+ name = "windows",
+- constraint_values = ["@bazel_tools//platforms:windows"],
++ constraint_values = ["@platforms//os:windows"],
+ )
+
+ config_setting(
+diff --git a/upb/upb.c b/upb/upb.c
+index 266ea7d..1410b2d 100644
+index 266ea7d7..1410b2d8 100644
+--- a/upb/upb.c
++++ b/upb/upb.c
+@@ -11,17 +11,6 @@
+
+
+ #include "upb/port_def.inc"
+
+
+-/* Guarantee null-termination and provide ellipsis truncation.
+- * It may be tempting to "optimize" this by initializing these final
+- * four bytes up-front and then being careful never to overwrite them,
Expand All @@ -67,7 +81,7 @@ index 00000000..7d747c48
+-}
+-
+ /* upb_status *****************************************************************/
+
+
+ void upb_status_clear(upb_status *status) {
+@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; }
+ void upb_status_seterrmsg(upb_status *status, const char *msg) {
Expand All @@ -78,7 +92,7 @@ index 00000000..7d747c48
++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1);
++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
+ }
+
+
+ void upb_status_seterrf(upb_status *status, const char *fmt, ...) {
+@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) {
+ if (!status) return;
Expand All @@ -87,11 +101,12 @@ index 00000000..7d747c48
+- nullz(status);
++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
+ }
+
+
+ /* upb_alloc ******************************************************************/
+--
+2.34.1
+--
+2.40.1
+
--
2.34.1
--
2.40.1


20 changes: 10 additions & 10 deletions recipe/0301-Updated-protobuf-to-4.21.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
From 021ab7f7885825f05a7aedcc0c9f20812bcefdc6 Mon Sep 17 00:00:00 2001
From: Nishidha Panpaliya <npanpa23in.ibm.com>
Date: Wed, 29 Mar 2023 08:41:52 +0000
Subject: [PATCH] Updated protobuf to 3.21.12
From a5f9cfecf8a0548ed09886602cccf9a049b007ca Mon Sep 17 00:00:00 2001
From: Archana Shinde1 <archana.shinde2504@gmail.com>
Date: Wed, 20 Dec 2023 15:56:30 +0000
Subject: [PATCH] Updated protobuf to 4.21

---
WORKSPACE | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/WORKSPACE b/WORKSPACE
index ca83cb17..86081098 100644
index c60b5d8f..395f3ed3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -112,6 +112,15 @@ load("@lint_dependencies//:requirements.bzl", "pip_install")

pip_install()
@@ -91,6 +91,15 @@ switched_rules_by_language(
grpc = True,
)

+http_archive(
+ name = "com_google_protobuf",
Expand All @@ -26,7 +26,7 @@ index ca83cb17..86081098 100644
+
http_archive(
name = "org_tensorflow",
sha256 = "c030cb1905bff1d2446615992aad8d8d85cbe90c4fb625cee458c63bf466bc8e",
sha256 = "ce357fd0728f0d1b0831d1653f475591662ec5bca736a94ff789e6b1944df19f",
--
2.34.1
2.40.1

2 changes: 2 additions & 0 deletions recipe/build-tf-io-gcs-filesystem.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ set -vex

source open-ce-common-utils.sh

export TF_PYTHON_VERSION=$PY_VER

# Build Tensorflow from source
SCRIPT_DIR=$RECIPE_DIR/../buildscripts

Expand Down
2 changes: 2 additions & 0 deletions recipe/build-tf-io.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ set -vex

source open-ce-common-utils.sh

export TF_PYTHON_VERSION=$PY_VER

# Build Tensorflow from source
SCRIPT_DIR=$RECIPE_DIR/../buildscripts

Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set build_version = "0.33.0" %}
{% set build_version = "0.35.0" %}

package:
name: tensorflow-io
Expand All @@ -16,7 +16,7 @@ source:
- 0108-Fixed-upb.patch
- 0109-Add-include-path-for-rpc-headers-from-libtirpc-devel.patch #[ppc_arch == 'p10']
- 0301-Updated-protobuf-to-4.21.patch
- 0302-Fix-libwebp-linking-errors.patch
# - 0302-Fix-libwebp-linking-errors.patch

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pls remove this and corresponding patch.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its Done

build:
number: 1
Expand Down
Loading