rebase patches

recipe/patches/0001-Allow-for-custom-CUDA-build.patch

@@ -1,18 +1,17 @@
-From 803a48af47351366a13c1066c2049d3d8ec03767 Mon Sep 17 00:00:00 2001
+From 47a24be649ae10c722a43f12dc7032b63d3c77b1 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <[email protected]>
 Date: Sun, 8 Oct 2023 19:34:34 +0200
 Subject: [PATCH 1/2] Allow for custom CUDA build
 
 ---
- build/build.py       | 14 ++++++++++----
- build/tools/utils.py |  2 +-
- 2 files changed, 11 insertions(+), 5 deletions(-)
+ build/build.py | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/build/build.py b/build/build.py
-index 25a873d..a83aec6 100755
+index 5f43c2421..6939cc374 100755
 --- a/build/build.py
 +++ b/build/build.py
-@@ -515,6 +515,13 @@ async def main():
+@@ -527,6 +527,13 @@ async def main():
 
        if args.cuda_version:
          logging.debug("Hermetic CUDA version: %s", args.cuda_version)
@@ -26,11 +25,11 @@ index 25a873d..a83aec6 100755
          wheel_build_command.append(
              f"--repo_env=HERMETIC_CUDA_VERSION={args.cuda_version}"
          )
-@@ -597,10 +604,9 @@ async def main():
+@@ -609,10 +616,9 @@ async def main():
 
        wheel_build_command.append(f"--jaxlib_git_hash={git_hash}")
 
--      result = await executor.run(wheel_build_command.get_command_as_string(), args.dry_run)
+-      result = await executor.run(wheel_build_command.get_command_as_string(), args.dry_run, args.detailed_timestamped_log)
 -      # Exit with error if any wheel build fails.
 -      if result.return_code != 0:
 -        raise RuntimeError(f"Command failed with return code {result.return_code}")
@@ -40,16 +39,3 @@ index 25a873d..a83aec6 100755
 
    # Exit with success if all wheels in the list were built successfully.
    sys.exit(0)
-diff --git a/build/tools/utils.py b/build/tools/utils.py
-index 5d7c8e0..1a4b26f 100644
---- a/build/tools/utils.py
-+++ b/build/tools/utils.py
-@@ -222,7 +222,7 @@ def get_githash():
-         capture_output=True,
-         check=True,
-     ).stdout.strip()
--  except OSError:
-+  except (subprocess.CalledProcessError, OSError):
-     return ""
-
- def _parse_string_as_bool(s):

recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch

@@ -1,4 +1,4 @@
-From 6a5e829b219f840595084bc5ce05bf8fb96e80c5 Mon Sep 17 00:00:00 2001
+From 3fc0f7bad5d185004ba50abf6b7d0af81fa147bb Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <[email protected]>
 Date: Thu, 14 Dec 2023 17:06:15 +0100
 Subject: [PATCH 2/2] Consolidated build fixes for XLA
@@ -9,7 +9,7 @@ for xla to apply those patches.
 
 To maintain/rebase these patches, use a checkout of https://github.com/openxla/xla,
 and then rebase to the commit of xla being used by jax, which can be found in
-https://github.com/google/jax/blob/jaxlib-v{{ version }}/third_party/xla/workspace.bzl
+https://github.com/google/jax/blob/jax-v{{ version }}/third_party/xla/workspace.bzl
 which is also where we're patching in the list of patches to apply to xla.
 
 Co-Authored-By: H. Vetinari <[email protected]>
@@ -31,11 +31,11 @@ Co-Authored-By: H. Vetinari <[email protected]>
 
 diff --git a/third_party/xla/0001-Support-third-party-build-of-boringssl.patch b/third_party/xla/0001-Support-third-party-build-of-boringssl.patch
 new file mode 100644
-index 0000000..f1ca8bf
+index 000000000..0d6fd60cf
 --- /dev/null
 +++ b/third_party/xla/0001-Support-third-party-build-of-boringssl.patch
 @@ -0,0 +1,51 @@
-+From 0091b1688bec824633dad1d7bb95380be76fd9fd Mon Sep 17 00:00:00 2001
++From 49a684836e4cde37d326aaac66fd7ed74e396f3b Mon Sep 17 00:00:00 2001
 +From: "Uwe L. Korn" <[email protected]>
 +Date: Thu, 14 Dec 2023 15:04:51 +0100
 +Subject: [PATCH 1/6] Support third-party build of boringssl
@@ -74,10 +74,10 @@ index 0000000..f1ca8bf
 ++    ],
 ++)
 +diff --git a/workspace2.bzl b/workspace2.bzl
-+index 84ba78119b..70fefac97a 100644
++index 20ffe0cf82..a765265bad 100644
 +--- a/workspace2.bzl
 ++++ b/workspace2.bzl
-+@@ -69,7 +69,7 @@ def _tf_repositories():
++@@ -108,7 +108,7 @@ def _tf_repositories():
 +         name = "boringssl",
 +         sha256 = "9dc53f851107eaf87b391136d13b815df97ec8f76dadb487b58b2fc45e624d2c",
 +         strip_prefix = "boringssl-c00d7ca810e93780bd0c8ee4eea28f4f2ea4bcdc",
@@ -88,11 +88,11 @@ index 0000000..f1ca8bf
 + 
 diff --git a/third_party/xla/0002-Fix-abseil-headers.patch b/third_party/xla/0002-Fix-abseil-headers.patch
 new file mode 100644
-index 0000000..118b60e
+index 000000000..f2e4b1ab9
 --- /dev/null
 +++ b/third_party/xla/0002-Fix-abseil-headers.patch
 @@ -0,0 +1,73 @@
-+From 583296728feafa21677b4cf8d4e9eb9231b5d9fc Mon Sep 17 00:00:00 2001
++From bd9bdaf6ef5d57905620b167de2bba35d54ea930 Mon Sep 17 00:00:00 2001
 +From: "Uwe L. Korn" <[email protected]>
 +Date: Thu, 23 May 2024 15:45:52 +0200
 +Subject: [PATCH 2/6] Fix abseil headers
@@ -105,7 +105,7 @@ index 0000000..118b60e
 + 4 files changed, 10 insertions(+)
 +
 +diff --git a/xla/python/ifrt_proxy/common/BUILD b/xla/python/ifrt_proxy/common/BUILD
-+index b595a162ef..1a5f5d9a5f 100644
++index 506bcc0c47..11acfae12a 100644
 +--- a/xla/python/ifrt_proxy/common/BUILD
 ++++ b/xla/python/ifrt_proxy/common/BUILD
 +@@ -51,6 +51,9 @@ cc_library(
@@ -131,10 +131,10 @@ index 0000000..118b60e
 +         "@tsl//tsl/platform:protobuf",
 +         "@tsl//tsl/platform:status",
 +diff --git a/xla/tsl/platform/default/BUILD b/xla/tsl/platform/default/BUILD
-+index 86531a9c60..e427e1f1f0 100644
++index 0875f9a399..82379ca8df 100644
 +--- a/xla/tsl/platform/default/BUILD
 ++++ b/xla/tsl/platform/default/BUILD
-+@@ -229,6 +229,8 @@ cc_library(
++@@ -230,6 +230,8 @@ cc_library(
 +     ],
 +     deps = [
 +         "@com_google_absl//absl/log:check",
@@ -167,11 +167,11 @@ index 0000000..118b60e
 +         "@com_google_absl//absl/time",
 diff --git a/third_party/xla/0003-Omit-usage-of-StrFormat.patch b/third_party/xla/0003-Omit-usage-of-StrFormat.patch
 new file mode 100644
-index 0000000..048a570
+index 000000000..29326c54b
 --- /dev/null
 +++ b/third_party/xla/0003-Omit-usage-of-StrFormat.patch
 @@ -0,0 +1,25 @@
-+From 7b7c1a3120412b65080050e17effd8de753eba2d Mon Sep 17 00:00:00 2001
++From e4c2b38053744f0ce7a7cd734f0415504a514bc1 Mon Sep 17 00:00:00 2001
 +From: "Uwe L. Korn" <[email protected]>
 +Date: Thu, 4 Jul 2024 10:36:03 +0200
 +Subject: [PATCH 3/6] Omit usage of StrFormat
@@ -198,11 +198,11 @@ index 0000000..048a570
 + #include <vector>
 diff --git a/third_party/xla/0004-Add-missing-bits-absl-systemlib.patch b/third_party/xla/0004-Add-missing-bits-absl-systemlib.patch
 new file mode 100644
-index 0000000..a5fdf63
+index 000000000..6e2c94274
 --- /dev/null
 +++ b/third_party/xla/0004-Add-missing-bits-absl-systemlib.patch
 @@ -0,0 +1,245 @@
-+From db903958859521a6e2898690e893b1c11097139c Mon Sep 17 00:00:00 2001
++From 0ab5601817af80651b62decc237f01d461dc768b Mon Sep 17 00:00:00 2001
 +From: "Uwe L. Korn" <[email protected]>
 +Date: Thu, 4 Jul 2024 15:58:32 +0200
 +Subject: [PATCH 4/6] Add missing bits absl systemlib
@@ -449,11 +449,11 @@ index 0000000..a5fdf63
 +         "numeric",
 diff --git a/third_party/xla/0005-Check-whether-absl-log-is-already-initialized.patch b/third_party/xla/0005-Check-whether-absl-log-is-already-initialized.patch
 new file mode 100644
-index 0000000..76879ff
+index 000000000..d7a92b704
 --- /dev/null
 +++ b/third_party/xla/0005-Check-whether-absl-log-is-already-initialized.patch
 @@ -0,0 +1,58 @@
-+From f576357c00ca90f74037b56167020f90a65a945c Mon Sep 17 00:00:00 2001
++From e95ed3a620df2ba0513ee44b50eacef391b50088 Mon Sep 17 00:00:00 2001
 +From: "Uwe L. Korn" <[email protected]>
 +Date: Fri, 22 Nov 2024 10:51:18 +0100
 +Subject: [PATCH 5/6] Check whether absl log is already initialized
@@ -513,11 +513,11 @@ index 0000000..76879ff
 + }  // namespace xla
 diff --git a/third_party/xla/0006-Add-conda-cuda-path.patch b/third_party/xla/0006-Add-conda-cuda-path.patch
 new file mode 100644
-index 0000000..e3381f6
+index 000000000..164119e51
 --- /dev/null
 +++ b/third_party/xla/0006-Add-conda-cuda-path.patch
 @@ -0,0 +1,31 @@
-+From 5ef91efdec33a1e7cdf963c545b0dd1f232096bd Mon Sep 17 00:00:00 2001
++From 25667f2b9448fff8cc462dd386c85c96740c64af Mon Sep 17 00:00:00 2001
 +From: Silvio Traversaro <[email protected]>
 +Date: Tue, 10 Dec 2024 09:42:51 +0100
 +Subject: [PATCH 6/6] Add conda cuda path
@@ -549,7 +549,7 @@ index 0000000..e3381f6
 + #endif  // defined(PLATFORM_POSIX) && !defined(__APPLE__)
 + 
 diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl
-index db34354..4fd524a 100644
+index d08d9bba9..f3ad6a5a6 100644
 --- a/third_party/xla/workspace.bzl
 +++ b/third_party/xla/workspace.bzl
 @@ -30,6 +30,14 @@ def repo():