[patch] tensorflow-2.5.0-r1-build-with-std-c-14.patch

0001-sci-libs-tensorflow-2.5.0-r1-build-with-std-c-14.patch (text/plain), 3.77 KB, created by kfm on 2021-09-21 07:08:29 UTC

From e2e383e6c29b76de879d19641c997681fe3ff711 Mon Sep 17 00:00:00 2001
From: Kerin Millar <[e-mail]>
Date: Tue, 21 Sep 2021 07:55:42 +0100
Subject: [PATCH] sci-libs/tensorflow-2.5.0-r1: build with -std=c++14

TensorFlow is not yet compatible with the C++17 dialect. Allow it to
build with gcc:11 by appending -std=c++14 to CXXFLAGS, prior to composing
bazelrc. The flag doesn't encompass the building of the ruy library, so
this is accompanied by a patch to include the <limits> header in the one
place that ruy needs it.

Filter out the -fvtable-verify=@(std|preinit) flag, if present. While
ostensibly useful for hardening, it prevents TensorFlow from building
successfully. Note that, while the pattern is in the form of an
extglob, the accompanying shopt does _not_ need to be enabled.

Have src_install localise "l", rather than "j", because the function in
question never employs the latter.

Signed-off-by: Kerin Millar <[e-mail]>
---
 .../files/0008-patch-ruy-for-gcc-11.patch     | 37 +++++++++++++++++++
 .../tensorflow/tensorflow-2.5.0-r1.ebuild     |  7 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch

diff --git a/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch b/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch
new file mode 100644
index 000000000..3bb2cf2e1
--- /dev/null
+++ b/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch
@@ -0,0 +1,37 @@
+diff --git a/third_party/ruy/commit-3c93cda.patch b/third_party/ruy/commit-3c93cda.patch
+new file mode 100644
+index 00000000000..e530a842717
+--- /dev/null
++++ b/third_party/ruy/commit-3c93cda.patch
+@@ -0,0 +1,21 @@
++From 3c93cda8211efa01128d48950f0d6ee5233c5b9b Mon Sep 17 00:00:00 2001
++From: stha09 <[e-mail]>
++Date: Thu, 6 May 2021 18:31:30 +0200
++Subject: [PATCH] IWYU: include limits for std::numeric_limits (#253)
++
++---
++ ruy/block_map.cc | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/ruy/block_map.cc b/ruy/block_map.cc
++index 6c01e52a02..e04e7aff4a 100644
++--- a/ruy/block_map.cc
+++++ b/ruy/block_map.cc
++@@ -17,6 +17,7 @@ limitations under the License.
++ 
++ #include <algorithm>
++ #include <cstdint>
+++#include <limits>
++ 
++ #ifdef RUY_MAKEBLOCKMAP_DEBUG
++ #include <cstdio>
+diff --git a/third_party/ruy/workspace.bzl b/third_party/ruy/workspace.bzl
+index 50769621770..7e91d640469 100644
+--- a/third_party/ruy/workspace.bzl
++++ b/third_party/ruy/workspace.bzl
+@@ -12,4 +12,5 @@ def repo():
+             "https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip",
+         ],
+         build_file = "//third_party/ruy:BUILD",
++        patch_file = "//third_party/ruy:commit-3c93cda.patch"
+     )
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
index 1a9cf3d07..642c413aa 100644
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
@@ -145,6 +145,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/0008-patch-ruy-for-gcc-11.patch"
+)
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
 CHECKREQS_MEMORY="5G"
 CHECKREQS_DISK_BUILD="10G"
@@ -187,6 +190,8 @@ src_prepare() {
 	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
 
 	append-flags $(get-cpu-flags)
+	append-cxxflags -std=c++14 # bug 787938
+	filter-flags '-fvtable-verify=@(std|preinit)'
 	bazel_setup_bazelrc
 
 	eapply "${WORKDIR}"/patches/*.patch
@@ -356,7 +361,7 @@ src_compile() {
 }
 
 src_install() {
-	local i j
+	local i l
 	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
 	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
 
-- 
2.33.0