Skip to content

Commit 361420d

Browse files
committed
new patches for 2.19 from yocto and arch
1 parent a7b5948 commit 361420d

File tree

40 files changed

+692
-129
lines changed

40 files changed

+692
-129
lines changed

recipe/meta.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,18 @@ source:
5959
- patches/0030-Fixup-pybind11_protobuf.patch
6060
- patches/0031-Update-linkages-for-new-absl-organization.patch
6161
# Already included in the release after 2.19.0
62-
- patches/0032-fix-mlir-trivial-constructor.patch
62+
- patches/0032-Remove-ambiguous-inherited-constructor-in-default_qu.patch
63+
# these came from https://git.yoctoproject.org/meta-tensorflow/tree/recipes-framework/tensorflow/files
64+
# check every release there for patches in the future
65+
- patches/0033-third_party-ducc-fix-ambiguous-failure.patch
66+
- patches/0034-third_party-tf_runtime-fix-compile-failure.patch
67+
- patches/0035-support-to-build-with-gcc-15.patch
68+
- patches/0036-third_party-eigen_archive-workaround-ice-failure-whi.patch
69+
# for our system absl
70+
- patches/0037-add-absl_tracing_internal.patch
71+
# for the megabuild
72+
- patches/0038-Fix-building-different-python-wheels-from-one-python.patch
73+
- patches/0039-Fix-matmul-unused-result-error.patch
6374
- url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz
6475
sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530
6576
folder: tensorflow-estimator

recipe/patches/0001-loosen-requirements.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 3e11e83a4e6b381f17e993266cb52c67b23383b7 Mon Sep 17 00:00:00 2001
1+
From ff596dcd168e55e055bb34da014830a6abd69d1c Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Thu, 30 Dec 2021 06:57:09 +0200
4-
Subject: [PATCH 01/29] loosen requirements
4+
Subject: [PATCH 01/39] loosen requirements
55

66
* Remove unused libclang requirement
77
* Remove unecessary tensorflow-io-gcs-filesystem
@@ -15,7 +15,7 @@ Co-authored-by: Uwe L. Korn <uwelk@xhochy.com>
1515
1 file changed, 4 deletions(-)
1616

1717
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
18-
index f5d074a9dc4..3552878c51d 100644
18+
index 8f2d06ec..35290f22 100644
1919
--- a/tensorflow/tools/pip_package/setup.py
2020
+++ b/tensorflow/tools/pip_package/setup.py
2121
@@ -84,7 +84,6 @@ REQUIRED_PACKAGES = [

recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 09eff6c3c065d9e6c7316f979b90aa6848117d85 Mon Sep 17 00:00:00 2001
1+
From 4141ae64bb64669036ca8b39cd6f366fa3c9008d Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Fri, 30 Jun 2023 08:39:32 +0000
4-
Subject: [PATCH 02/29] Add additional absl_synchronization linkage to gRPC
4+
Subject: [PATCH 02/39] Add additional absl_synchronization linkage to gRPC
55

66
---
77
third_party/systemlibs/grpc.BUILD | 3 +++
88
1 file changed, 3 insertions(+)
99

1010
diff --git a/third_party/systemlibs/grpc.BUILD b/third_party/systemlibs/grpc.BUILD
11-
index 0e4e862ce4c..e794699772e 100644
11+
index 0e4e862c..e7946997 100644
1212
--- a/third_party/systemlibs/grpc.BUILD
1313
+++ b/third_party/systemlibs/grpc.BUILD
1414
@@ -10,6 +10,7 @@ cc_library(

recipe/patches/0003-Fix-missing-abseil-linkages.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 8adaa49cd421c8c2326812d31cb28dbade147384 Mon Sep 17 00:00:00 2001
1+
From 305cbb902cebf0cc7fbbeb9848f8493abaf2a42a Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Mon, 3 Jul 2023 04:45:46 +0000
4-
Subject: [PATCH 03/29] Fix missing abseil linkages
4+
Subject: [PATCH 03/39] Fix missing abseil linkages
55

66
---
77
third_party/absl/system.absl.strings.BUILD | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD
11-
index fa9a7a84f67..d04776c98bf 100644
11+
index fa9a7a84..d04776c9 100644
1212
--- a/third_party/absl/system.absl.strings.BUILD
1313
+++ b/third_party/absl/system.absl.strings.BUILD
1414
@@ -26,7 +26,7 @@ cc_library(

recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
From 6019245a5452cf34f3bc11132bc91b16422175b7 Mon Sep 17 00:00:00 2001
1+
From 55b74b07930e4b2e1e31c5c49eeaf04e99890d6b Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Wed, 30 Aug 2023 16:58:41 +0200
4-
Subject: [PATCH 04/29] Fix protobuf_python for systemlibs
4+
Subject: [PATCH 04/39] Fix protobuf_python for systemlibs
55

66
---
7-
tensorflow/workspace2.bzl | 2 ++
8-
third_party/systemlibs/protobuf_python.bzl | 5 ++++
9-
3 files changed, 30 insertions(+)
7+
tensorflow/workspace2.bzl | 1 +
8+
third_party/systemlibs/protobuf_python.bzl | 5 +++++
9+
2 files changed, 6 insertions(+)
1010
create mode 100644 third_party/systemlibs/protobuf_python.bzl
1111

1212
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
13-
index 5d75ffd4a6d..e985a71b74e 100644
13+
index 5d75ffd4..fe87aac9 100644
1414
--- a/tensorflow/workspace2.bzl
1515
+++ b/tensorflow/workspace2.bzl
1616
@@ -401,6 +401,7 @@ def _tf_repositories():

recipe/patches/0005-Add-absl_log-systemlib.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From c425a6ebe27766c3ab48cfd195adb8657f3d2e91 Mon Sep 17 00:00:00 2001
1+
From 2111680657abcbe2cfebaeb8c37c3b570a6e5b37 Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Wed, 30 Aug 2023 16:59:28 +0200
4-
Subject: [PATCH 05/29] Add absl_log systemlib
4+
Subject: [PATCH 05/39] Add absl_log systemlib
55

66
---
77
third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++
@@ -11,7 +11,7 @@ Subject: [PATCH 05/29] Add absl_log systemlib
1111

1212
diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
1313
new file mode 100644
14-
index 00000000000..0248bda0f52
14+
index 00000000..0248bda0
1515
--- /dev/null
1616
+++ b/third_party/absl/system.absl.log.BUILD
1717
@@ -0,0 +1,22 @@
@@ -38,7 +38,7 @@ index 00000000000..0248bda0f52
3838
+ ],
3939
+)
4040
diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl
41-
index d5973b13b39..b5197f9304b 100644
41+
index d5973b13..b5197f93 100644
4242
--- a/third_party/absl/workspace.bzl
4343
+++ b/third_party/absl/workspace.bzl
4444
@@ -20,6 +20,7 @@ def repo():

recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From 8b89d20aca79e7761178f4e89370afa14dfb3441 Mon Sep 17 00:00:00 2001
1+
From 3e9efb698ca37ae10486a21dd8bd5a410a6c87d6 Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Fri, 15 Sep 2023 11:06:27 +0200
4-
Subject: [PATCH 06/29] Omit linking to layout_proto_cc if protobuf linkage is
4+
Subject: [PATCH 06/39] Omit linking to layout_proto_cc if protobuf linkage is
55
shared
66

77
---
88
tensorflow/python/BUILD | 1 -
99
1 file changed, 1 deletion(-)
1010

1111
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
12-
index 8a781badc68..5edfb0a4846 100644
12+
index 8a781bad..5edfb0a4 100644
1313
--- a/tensorflow/python/BUILD
1414
+++ b/tensorflow/python/BUILD
1515
@@ -1382,7 +1382,6 @@ tf_python_pybind_extension(

recipe/patches/0007-Fix-further-abseil-linkage.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 84cb2f5f90e632e011471ac215b492bf64c12e38 Mon Sep 17 00:00:00 2001
1+
From 801de98ce58e992ec2cfb73553525016cd87c8bc Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Mon, 18 Sep 2023 14:47:08 +0000
4-
Subject: [PATCH 07/29] Fix further abseil linkage
4+
Subject: [PATCH 07/39] Fix further abseil linkage
55

66
---
77
third_party/absl/system.absl.base.BUILD | 14 ++++++++++++--
88
1 file changed, 12 insertions(+), 2 deletions(-)
99

1010
diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
11-
index d6bf8748dee..b3e42f4dd8b 100644
11+
index d6bf8748..b3e42f4d 100644
1212
--- a/third_party/absl/system.absl.base.BUILD
1313
+++ b/third_party/absl/system.absl.base.BUILD
1414
@@ -17,12 +17,22 @@ package(default_visibility = ["//visibility:public"])

recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From c84dc750c765d7c295d3ab9c01ce885006c8b732 Mon Sep 17 00:00:00 2001
1+
From bbd395cd8b092aaf13e6214a796f3f3239b631d0 Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Fri, 27 Oct 2023 11:20:12 +0200
4-
Subject: [PATCH 08/29] Add constraint to pybind11 systemlib
4+
Subject: [PATCH 08/39] Add constraint to pybind11 systemlib
55

66
---
77
third_party/systemlibs/pybind11.BUILD | 6 ++++++
88
1 file changed, 6 insertions(+)
99

1010
diff --git a/third_party/systemlibs/pybind11.BUILD b/third_party/systemlibs/pybind11.BUILD
11-
index 44e7496fc25..21ec073b7a4 100644
11+
index 44e7496f..21ec073b 100644
1212
--- a/third_party/systemlibs/pybind11.BUILD
1313
+++ b/third_party/systemlibs/pybind11.BUILD
1414
@@ -6,3 +6,9 @@ cc_library(

recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 4b08be53c878490bcc5f73b2aac8cf02029c1de1 Mon Sep 17 00:00:00 2001
1+
From 3052d2152910224e9728bfb448fe4f35065191b0 Mon Sep 17 00:00:00 2001
22
From: "Uwe L. Korn" <uwe.korn@quantco.com>
33
Date: Fri, 27 Oct 2023 11:21:11 +0200
4-
Subject: [PATCH 09/29] Different file ending for flatbuffers LICENSE
4+
Subject: [PATCH 09/39] Different file ending for flatbuffers LICENSE
55

66
---
77
third_party/flatbuffers/BUILD.system | 5 +++++
88
1 file changed, 5 insertions(+)
99

1010
diff --git a/third_party/flatbuffers/BUILD.system b/third_party/flatbuffers/BUILD.system
11-
index 8fe4d7a5907..297f8baf0c0 100644
11+
index 8fe4d7a5..297f8baf 100644
1212
--- a/third_party/flatbuffers/BUILD.system
1313
+++ b/third_party/flatbuffers/BUILD.system
1414
@@ -5,6 +5,11 @@ filegroup(

0 commit comments

Comments
 (0)