From 9e657c891bf358c64a369e5278688af31621ca4a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 Oct 2025 00:02:37 +0000 Subject: [PATCH 1/4] updated v0.8.0 --- recipe/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 94243725..c915f16d 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,8 +1,8 @@ schema_version: 1 context: - version: 0.7.2 - build: 2 + version: "0.8.0" + build: 0 package: name: jaxlib @@ -11,7 +11,7 @@ package: source: # only pull sources after upstream PyPI release... url: https://github.com/jax-ml/jax/archive/jax-v${{ version }}.tar.gz - sha256: 56d92604f1bb60bb3dbd7dc7c7dc21502d10b3474b8b905ce29ce06db6a26e45 + sha256: 864aa46b5a4475c70195bd3728d32224f5b5ae1c7dd9c70646ef1387b4b0b04b patches: - patches/0001-Allow-for-custom-CUDA-build.patch - patches/0002-Consolidated-build-fixes-for-XLA.patch From 646e72308472e541463f2e0b51d3b9bafaab364e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 5 Nov 2025 17:17:02 +1100 Subject: [PATCH 2/4] MNT: Re-rendered with conda-smithy 3.52.4.dev18+g275dd5c78 and conda-forge-pinning 2025.11.04.15.21.15 Other tools: - conda-build 25.7.0 - rattler-build 0.47.0 - rattler-build-conda-compat 1.4.6 --- pixi.toml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pixi.toml b/pixi.toml index 99ba19ab..1dc85694 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,24 +1,22 @@ +# -*- mode: toml -*- # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: toml -*- +"$schema" = "https://pixi.sh/v0.59.0/schema/manifest/schema.json" -# VVVVVV minimum `pixi` version -"$schema" = "https://pixi.sh/v0.36.0/schema/manifest/schema.json" - -[project] +[workspace] name = "jaxlib-feedstock" -version = "3.52.3" # conda-smithy version used to generate this file +version = "3.52.4.dev18+g275dd5c78" # conda-smithy version used to generate this file description = "Pixi configuration for conda-forge/jaxlib-feedstock" authors = ["@conda-forge/jaxlib"] channels = ["conda-forge"] platforms = ["linux-64", "osx-64", "win-64"] +requires-pixi = ">=0.59.0" [dependencies] conda-build = ">=24.1" conda-forge-ci-setup = "4.*" rattler-build = "*" -[tasks] [tasks.inspect-all] cmd = "inspect_artifacts --all-packages" description = "List contents of all packages found in rattler-build build directory." @@ -172,7 +170,6 @@ description = "List contents of jaxlib-feedstock packages built for variant osx_ [feature.smithy.dependencies] conda-smithy = "*" -shellcheck = "*" [feature.smithy.tasks.build-locally] cmd = "python ./build-locally.py" description = "Build packages locally using the same setup scripts used in conda-forge's CI" @@ -188,5 +185,6 @@ description = "Lint the feedstock recipe" [environments] smithy = ["smithy"] + # This is a copy of default, to be enabled by build_steps.sh during Docker builds # __PLATFORM_SPECIFIC_ENV__ = [] From 69f2790e85cb887f676e79b96b5413465a6fe63e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 Oct 2025 11:53:09 +0200 Subject: [PATCH 3/4] rebase patches --- .../0001-Allow-for-custom-CUDA-build.patch | 8 +- ...002-Consolidated-build-fixes-for-XLA.patch | 310 ++++++------------ ...t-doesn-t-seem-to-have-current-xla-a.patch | 4 +- ...4-re-enable-use_fast_cpp_protos-true.patch | 12 +- 4 files changed, 121 insertions(+), 213 deletions(-) diff --git a/recipe/patches/0001-Allow-for-custom-CUDA-build.patch b/recipe/patches/0001-Allow-for-custom-CUDA-build.patch index f8fa5578..7fe7ac83 100644 --- a/recipe/patches/0001-Allow-for-custom-CUDA-build.patch +++ b/recipe/patches/0001-Allow-for-custom-CUDA-build.patch @@ -1,4 +1,4 @@ -From c850b31214595ff30a3612f9f95369685f6f0bb5 Mon Sep 17 00:00:00 2001 +From 7d18804efba300f3236c0d642f921004ebe1833f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 8 Oct 2023 19:34:34 +0200 Subject: [PATCH 1/4] Allow for custom CUDA build @@ -8,11 +8,11 @@ Subject: [PATCH 1/4] Allow for custom CUDA build 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build/build.py b/build/build.py -index 2b4f71d..653204c 100755 +index 70e9bc225..c432f2117 100755 --- a/build/build.py +++ b/build/build.py -@@ -701,10 +701,9 @@ async def main(): - if wheel =="jax": +@@ -703,10 +703,9 @@ async def main(): + if wheel == "jax": wheel_build_command.append("--//jax:build_jaxlib=false") - result = await executor.run(wheel_build_command.get_command_as_string(), args.dry_run, args.detailed_timestamped_log) diff --git a/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch b/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch index 64e9c6f8..33715ff5 100644 --- a/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch +++ b/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch @@ -1,4 +1,4 @@ -From 225a60e4fdf661415d95bf6a01296fb9e732ad80 Mon Sep 17 00:00:00 2001 +From 8028653c2074db513d54f605a486f4ed0f80dd76 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 17:06:15 +0100 Subject: [PATCH 2/4] Consolidated build fixes for XLA @@ -15,37 +15,33 @@ which is also where we're patching in the list of patches to apply to xla. Co-Authored-By: H. Vetinari --- third_party/grpc_systemlib.BUILD | 71 +++ - ...pport-third-party-build-of-boringssl.patch | 50 +++ - third_party/xla/0002-Fix-abseil-headers.patch | 101 +++++ - .../xla/0003-Omit-usage-of-StrFormat.patch | 25 ++ - .../xla/0004-Re-enable-system-abseil.patch | 411 ++++++++++++++++++ + third_party/xla/0001-Fix-abseil-headers.patch | 101 +++++ + .../xla/0002-Omit-usage-of-StrFormat.patch | 25 ++ + .../xla/0003-Re-enable-system-abseil.patch | 411 ++++++++++++++++++ ...ther-absl-log-is-already-initialized.patch | 58 +++ - third_party/xla/0006-Unbundle-grpc.patch | 152 +++++++ + third_party/xla/0005-Unbundle-grpc.patch | 152 +++++++ ...-coordination_agent_recoverable-flag.patch | 35 ++ ...al-variant-_access-is-now-header-onl.patch | 29 ++ ...d-dependency-on-proto_bazel_features.patch | 72 +++ - .../xla/0010-Update-gloo-version.patch | 24 + - .../0011-Add-macos_x86_64-to-mkl_deps.patch | 21 + - .../xla/0012-Add-systemlib-for-oneDNN.patch | 35 ++ - third_party/xla/workspace.bzl | 16 +- - 14 files changed, 1099 insertions(+), 1 deletion(-) + .../0009-Add-macos_x86_64-to-mkl_deps.patch | 21 + + .../xla/0010-Add-systemlib-for-oneDNN.patch | 35 ++ + third_party/xla/workspace.bzl | 14 +- + 12 files changed, 1023 insertions(+), 1 deletion(-) create mode 100644 third_party/grpc_systemlib.BUILD - create mode 100644 third_party/xla/0001-Support-third-party-build-of-boringssl.patch - create mode 100644 third_party/xla/0002-Fix-abseil-headers.patch - create mode 100644 third_party/xla/0003-Omit-usage-of-StrFormat.patch - create mode 100644 third_party/xla/0004-Re-enable-system-abseil.patch - create mode 100644 third_party/xla/0005-Check-whether-absl-log-is-already-initialized.patch - create mode 100644 third_party/xla/0006-Unbundle-grpc.patch - create mode 100644 third_party/xla/0007-Disable-coordination_agent_recoverable-flag.patch - create mode 100644 third_party/xla/0008-absl_bad_-optional-variant-_access-is-now-header-onl.patch - create mode 100644 third_party/xla/0009-Add-dependency-on-proto_bazel_features.patch - create mode 100644 third_party/xla/0010-Update-gloo-version.patch - create mode 100644 third_party/xla/0011-Add-macos_x86_64-to-mkl_deps.patch - create mode 100644 third_party/xla/0012-Add-systemlib-for-oneDNN.patch + create mode 100644 third_party/xla/0001-Fix-abseil-headers.patch + create mode 100644 third_party/xla/0002-Omit-usage-of-StrFormat.patch + create mode 100644 third_party/xla/0003-Re-enable-system-abseil.patch + create mode 100644 third_party/xla/0004-Check-whether-absl-log-is-already-initialized.patch + create mode 100644 third_party/xla/0005-Unbundle-grpc.patch + create mode 100644 third_party/xla/0006-Disable-coordination_agent_recoverable-flag.patch + create mode 100644 third_party/xla/0007-absl_bad_-optional-variant-_access-is-now-header-onl.patch + create mode 100644 third_party/xla/0008-Add-dependency-on-proto_bazel_features.patch + create mode 100644 third_party/xla/0009-Add-macos_x86_64-to-mkl_deps.patch + create mode 100644 third_party/xla/0010-Add-systemlib-for-oneDNN.patch diff --git a/third_party/grpc_systemlib.BUILD b/third_party/grpc_systemlib.BUILD new file mode 100644 -index 0000000..0e4e862 +index 000000000..0e4e862ce --- /dev/null +++ b/third_party/grpc_systemlib.BUILD @@ -0,0 +1,71 @@ @@ -120,72 +116,16 @@ index 0000000..0e4e862 + srcs = ["grpc_python_plugin.bin"], + visibility = ["//visibility:public"], +) -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 +diff --git a/third_party/xla/0001-Fix-abseil-headers.patch b/third_party/xla/0001-Fix-abseil-headers.patch new file mode 100644 -index 0000000..2e4b647 +index 000000000..05d10bda1 --- /dev/null -+++ b/third_party/xla/0001-Support-third-party-build-of-boringssl.patch -@@ -0,0 +1,50 @@ -+From a2851a49bb15b571ad78bbb0aef805bd1016e26c Mon Sep 17 00:00:00 2001 -+From: "Uwe L. Korn" -+Date: Thu, 14 Dec 2023 15:04:51 +0100 -+Subject: [PATCH 01/12] Support third-party build of boringssl -+ -+--- -+ third_party/boringssl.BUILD | 21 +++++++++++++++++++++ -+ workspace2.bzl | 1 + -+ 2 files changed, 22 insertions(+) -+ create mode 100644 third_party/boringssl.BUILD -+ -+diff --git a/third_party/boringssl.BUILD b/third_party/boringssl.BUILD -+new file mode 100644 -+index 0000000000..bc4c533403 -+--- /dev/null -++++ b/third_party/boringssl.BUILD -+@@ -0,0 +1,21 @@ -++licenses(["notice"]) -++ -++filegroup( -++ name = "LICENSE", -++ visibility = ["//visibility:public"], -++) -++ -++cc_library( -++ name = "crypto", -++ linkopts = ["-lcrypto"], -++ visibility = ["//visibility:public"], -++) -++ -++cc_library( -++ name = "ssl", -++ linkopts = ["-lssl"], -++ visibility = ["//visibility:public"], -++ deps = [ -++ ":crypto", -++ ], -++) -+diff --git a/workspace2.bzl b/workspace2.bzl -+index f0196f12c2..17458789c4 100644 -+--- a/workspace2.bzl -++++ b/workspace2.bzl -+@@ -456,6 +456,7 @@ def _tf_repositories(): -+ name = "boringssl", -+ sha256 = "9dc53f851107eaf87b391136d13b815df97ec8f76dadb487b58b2fc45e624d2c", -+ strip_prefix = "boringssl-c00d7ca810e93780bd0c8ee4eea28f4f2ea4bcdc", -++ system_build_file = "//third_party:boringssl.BUILD", -+ urls = tf_mirror_urls("https://github.com/google/boringssl/archive/c00d7ca810e93780bd0c8ee4eea28f4f2ea4bcdc.tar.gz"), -+ ) -+ -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..5a74714 ---- /dev/null -+++ b/third_party/xla/0002-Fix-abseil-headers.patch ++++ b/third_party/xla/0001-Fix-abseil-headers.patch @@ -0,0 +1,101 @@ -+From aae46f4c56e5e426d3d1c9516d343f94484e4b78 Mon Sep 17 00:00:00 2001 ++From 2f488a0e71990dcf85b7837c72a3d89dd3f7f394 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 23 May 2024 15:45:52 +0200 -+Subject: [PATCH 02/12] Fix abseil headers ++Subject: [PATCH 01/10] Fix abseil headers + +--- + xla/backends/cpu/codegen/ir_compiler.cc | 2 +- @@ -197,7 +137,7 @@ index 0000000..5a74714 + 6 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/xla/backends/cpu/codegen/ir_compiler.cc b/xla/backends/cpu/codegen/ir_compiler.cc -+index 288d5e6ce7..66adf57ad6 100644 ++index d53ff46421..ff09084ca2 100644 +--- a/xla/backends/cpu/codegen/ir_compiler.cc ++++ b/xla/backends/cpu/codegen/ir_compiler.cc +@@ -139,7 +139,7 @@ static std::unique_ptr ParseXlaBackendExtraOptions( @@ -210,10 +150,10 @@ index 0000000..5a74714 + llvm::Metadata* md = llvm_module.getModuleFlag("xla_backend_extra_options"); + if (md == nullptr) return nullptr; +diff --git a/xla/hlo/transforms/simplifiers/algebraic_simplifier.h b/xla/hlo/transforms/simplifiers/algebraic_simplifier.h -+index d55d927cd1..54d9e69ab2 100644 ++index 4d688d39eb..ff3748465c 100644 +--- a/xla/hlo/transforms/simplifiers/algebraic_simplifier.h ++++ b/xla/hlo/transforms/simplifiers/algebraic_simplifier.h -+@@ -825,7 +825,7 @@ class AlgebraicSimplifierVisitor : public DfsHloRewriteVisitor { ++@@ -830,7 +830,7 @@ class AlgebraicSimplifierVisitor : public DfsHloRewriteVisitor { + // slice instruction is replaced). + // - For example in slices=([0:X:X]), where X == dimension + absl::StatusOr RemoveRedundantStride( @@ -223,7 +163,7 @@ index 0000000..5a74714 + // Helper function for HandleReduce. Replaces a reduce with a broadcast of the + // init values if the reduce is operating on a zero-element array or the +diff --git a/xla/python/ifrt_proxy/common/BUILD b/xla/python/ifrt_proxy/common/BUILD -+index 432b4db904..cb0fa67a62 100644 ++index b547cea85d..7b2eeaaed2 100644 +--- a/xla/python/ifrt_proxy/common/BUILD ++++ b/xla/python/ifrt_proxy/common/BUILD +@@ -51,6 +51,9 @@ cc_library( @@ -249,10 +189,10 @@ index 0000000..5a74714 + "@tsl//tsl/platform:protobuf", + "@tsl//tsl/platform:stringpiece", +diff --git a/xla/tsl/platform/default/BUILD b/xla/tsl/platform/default/BUILD -+index c118b2f877..5ef81fcdd5 100644 ++index 8b3dbd16f1..d11a07b299 100644 +--- a/xla/tsl/platform/default/BUILD ++++ b/xla/tsl/platform/default/BUILD -+@@ -251,6 +251,8 @@ cc_library( ++@@ -253,6 +253,8 @@ cc_library( + deps = [ + "//xla/tsl/platform:logging", + "@com_google_absl//absl/log:check", @@ -262,7 +202,7 @@ index 0000000..5a74714 + ) + +diff --git a/xla/tsl/profiler/rpc/client/BUILD b/xla/tsl/profiler/rpc/client/BUILD -+index ce37e1624b..b0ea3c03f3 100644 ++index 9cdb58b507..d851304e01 100644 +--- a/xla/tsl/profiler/rpc/client/BUILD ++++ b/xla/tsl/profiler/rpc/client/BUILD +@@ -102,6 +102,8 @@ cc_library( @@ -283,23 +223,23 @@ index 0000000..5a74714 + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@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 +diff --git a/third_party/xla/0002-Omit-usage-of-StrFormat.patch b/third_party/xla/0002-Omit-usage-of-StrFormat.patch new file mode 100644 -index 0000000..fc03f77 +index 000000000..f2180c379 --- /dev/null -+++ b/third_party/xla/0003-Omit-usage-of-StrFormat.patch ++++ b/third_party/xla/0002-Omit-usage-of-StrFormat.patch @@ -0,0 +1,25 @@ -+From 2a76daeb6f08cd8987c9e3ceda6d493479fecae1 Mon Sep 17 00:00:00 2001 ++From 96165020cdfc10467759e9ad6c82c152735423a0 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 4 Jul 2024 10:36:03 +0200 -+Subject: [PATCH 03/12] Omit usage of StrFormat ++Subject: [PATCH 02/10] Omit usage of StrFormat + +--- + xla/stream_executor/gpu/gpu_executor.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/xla/stream_executor/gpu/gpu_executor.h b/xla/stream_executor/gpu/gpu_executor.h -+index ad9b10e3aa..a261c3071d 100644 ++index 31bb0e71b4..8a4a28a1e9 100644 +--- a/xla/stream_executor/gpu/gpu_executor.h ++++ b/xla/stream_executor/gpu/gpu_executor.h +@@ -17,6 +17,11 @@ limitations under the License. @@ -314,16 +254,16 @@ index 0000000..fc03f77 + #include + #include + #include -diff --git a/third_party/xla/0004-Re-enable-system-abseil.patch b/third_party/xla/0004-Re-enable-system-abseil.patch +diff --git a/third_party/xla/0003-Re-enable-system-abseil.patch b/third_party/xla/0003-Re-enable-system-abseil.patch new file mode 100644 -index 0000000..7b8db67 +index 000000000..7e1eeb5e3 --- /dev/null -+++ b/third_party/xla/0004-Re-enable-system-abseil.patch ++++ b/third_party/xla/0003-Re-enable-system-abseil.patch @@ -0,0 +1,411 @@ -+From ffbd2bf30c2cb7448418abdd017d6cf0e16f5a12 Mon Sep 17 00:00:00 2001 ++From b29189e58334ff724e21a5e0fa6446bb4268f5b4 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 4 Jul 2024 15:58:32 +0200 -+Subject: [PATCH 04/12] Re-enable system abseil ++Subject: [PATCH 03/10] Re-enable system abseil + +partially revert https://github.com/openxla/xla/commit/1fc2a846d259d3c896a6177485abcc68d97627a9 +and add missing pieces @@ -688,11 +628,11 @@ index 0000000..7b8db67 ++ visibility = ["//visibility:public"], ++) +diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -+index 6599b00908..bf22e44e97 100644 ++index 3538e8b3f1..5707abf373 100644 +--- a/third_party/absl/workspace.bzl ++++ b/third_party/absl/workspace.bzl +@@ -11,9 +11,39 @@ def repo(): -+ ABSL_SHA256 = "ed8f7d9f39139c449e79fd19765e23c96fdb774172d32d191323d3e3ea06e5ff" ++ ABSL_SHA256 = "f56086f4cdb0ab9b7c3ac46831b1faba3753248d0f06f8bca4c917a1de2a560a" + # LINT.ThenChange(//tensorflow/lite/tools/cmake/modules/abseil-cpp.cmake) + ++ SYS_DIRS = [ @@ -731,16 +671,16 @@ index 0000000..7b8db67 + strip_prefix = "abseil-cpp-{commit}".format(commit = ABSL_COMMIT), + urls = tf_mirror_urls("https://github.com/abseil/abseil-cpp/archive/{commit}.tar.gz".format(commit = ABSL_COMMIT)), + patch_file = [ -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 +diff --git a/third_party/xla/0004-Check-whether-absl-log-is-already-initialized.patch b/third_party/xla/0004-Check-whether-absl-log-is-already-initialized.patch new file mode 100644 -index 0000000..a42504a +index 000000000..0d2c9782e --- /dev/null -+++ b/third_party/xla/0005-Check-whether-absl-log-is-already-initialized.patch ++++ b/third_party/xla/0004-Check-whether-absl-log-is-already-initialized.patch @@ -0,0 +1,58 @@ -+From 34736e8d0b80576b7280ee2677d63377f2f38860 Mon Sep 17 00:00:00 2001 ++From 5d42f4ddfd56baf0162639ffe54c8ae08c1fea06 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Fri, 22 Nov 2024 10:51:18 +0100 -+Subject: [PATCH 05/12] Check whether absl log is already initialized ++Subject: [PATCH 04/10] Check whether absl log is already initialized + +--- + xla/pjrt/c/pjrt_c_api_gpu.cc | 7 ++++++- @@ -795,16 +735,16 @@ index 0000000..a42504a ++} + + } // namespace xla -diff --git a/third_party/xla/0006-Unbundle-grpc.patch b/third_party/xla/0006-Unbundle-grpc.patch +diff --git a/third_party/xla/0005-Unbundle-grpc.patch b/third_party/xla/0005-Unbundle-grpc.patch new file mode 100644 -index 0000000..6128f25 +index 000000000..c77e8a012 --- /dev/null -+++ b/third_party/xla/0006-Unbundle-grpc.patch ++++ b/third_party/xla/0005-Unbundle-grpc.patch @@ -0,0 +1,152 @@ -+From 24d5bcd89c961e0e1394ff89e622b75c6279776d Mon Sep 17 00:00:00 2001 ++From e2b3b689d8d722d5750a2f53cabb09a96cdd2a18 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Wed, 23 Jul 2025 13:19:52 +0200 -+Subject: [PATCH 06/12] Unbundle grpc ++Subject: [PATCH 05/10] Unbundle grpc + +--- + third_party/zlib.BUILD | 37 +------------------------------------ @@ -860,7 +800,7 @@ index 0000000..6128f25 ++ linkopts = ["-lz"], + ) +diff --git a/workspace0.bzl b/workspace0.bzl -+index 4d7dd87430..eef1a162f9 100644 ++index 473981911f..657030a44a 100644 +--- a/workspace0.bzl ++++ b/workspace0.bzl +@@ -5,7 +5,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") @@ -911,10 +851,10 @@ index 0000000..6128f25 + # shadowing previous loads and trigger a buildifier warning. + xla_workspace1 = workspace +diff --git a/workspace2.bzl b/workspace2.bzl -+index 17458789c4..a577783d44 100644 ++index bc1d6aa2cb..b2c5dda804 100644 +--- a/workspace2.bzl ++++ b/workspace2.bzl -+@@ -125,6 +125,23 @@ def _tf_toolchains(): ++@@ -146,6 +146,23 @@ def _tf_toolchains(): + aarch64_repo = "../aarch64_linux_toolchain", + armhf_repo = "../armhf_linux_toolchain", + ) @@ -938,7 +878,7 @@ index 0000000..6128f25 + + # Define all external repositories required by TensorFlow + def _tf_repositories(): -+@@ -365,12 +382,9 @@ def _tf_repositories(): ++@@ -349,12 +366,9 @@ def _tf_repositories(): + urls = tf_mirror_urls("https://curl.se/download/curl-8.11.0.tar.gz"), + ) + @@ -953,23 +893,23 @@ index 0000000..6128f25 + ) + + # Load the raw llvm-project. llvm does not have build rules set up by default, -diff --git a/third_party/xla/0007-Disable-coordination_agent_recoverable-flag.patch b/third_party/xla/0007-Disable-coordination_agent_recoverable-flag.patch +diff --git a/third_party/xla/0006-Disable-coordination_agent_recoverable-flag.patch b/third_party/xla/0006-Disable-coordination_agent_recoverable-flag.patch new file mode 100644 -index 0000000..c223006 +index 000000000..86a7748be --- /dev/null -+++ b/third_party/xla/0007-Disable-coordination_agent_recoverable-flag.patch ++++ b/third_party/xla/0006-Disable-coordination_agent_recoverable-flag.patch @@ -0,0 +1,35 @@ -+From e629f844604a26a5faf9fe5a343715e38c4f84e0 Mon Sep 17 00:00:00 2001 ++From f8cf64f6056602ac1d221cefaab76b585c4e5c6a Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 11 Sep 2025 21:30:50 +0200 -+Subject: [PATCH 07/12] Disable coordination_agent_recoverable flag ++Subject: [PATCH 06/10] Disable coordination_agent_recoverable flag + +--- + .../coordination/coordination_service_agent.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc b/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc -+index 58fca32ed1..7dc305e058 100644 ++index 22cdbacf14..5639da64d1 100644 +--- a/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc ++++ b/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc +@@ -57,9 +57,9 @@ limitations under the License. @@ -994,16 +934,16 @@ index 0000000..c223006 + LOG(WARNING) + << "Using experimental recoverable task feature. The default shutdown " + "barrier will only block non-recoverable tasks. If a synchronized " -diff --git a/third_party/xla/0008-absl_bad_-optional-variant-_access-is-now-header-onl.patch b/third_party/xla/0008-absl_bad_-optional-variant-_access-is-now-header-onl.patch +diff --git a/third_party/xla/0007-absl_bad_-optional-variant-_access-is-now-header-onl.patch b/third_party/xla/0007-absl_bad_-optional-variant-_access-is-now-header-onl.patch new file mode 100644 -index 0000000..433938e +index 000000000..09b22a1be --- /dev/null -+++ b/third_party/xla/0008-absl_bad_-optional-variant-_access-is-now-header-onl.patch ++++ b/third_party/xla/0007-absl_bad_-optional-variant-_access-is-now-header-onl.patch @@ -0,0 +1,29 @@ -+From c11358c6345d2727d0d0e6643660c548a9d2d32b Mon Sep 17 00:00:00 2001 ++From d5b2f100a8cde1813c8d90714b465774aa92e873 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 11 Sep 2025 21:33:07 +0200 -+Subject: [PATCH 08/12] absl_bad_{optional,variant}_access is now header-only ++Subject: [PATCH 07/10] absl_bad_{optional,variant}_access is now header-only + +--- + third_party/absl/system.absl.types.BUILD | 2 -- @@ -1029,16 +969,16 @@ index 0000000..433938e + deps = [ + "//absl/base:raw_logging_internal", + ], -diff --git a/third_party/xla/0009-Add-dependency-on-proto_bazel_features.patch b/third_party/xla/0009-Add-dependency-on-proto_bazel_features.patch +diff --git a/third_party/xla/0008-Add-dependency-on-proto_bazel_features.patch b/third_party/xla/0008-Add-dependency-on-proto_bazel_features.patch new file mode 100644 -index 0000000..cc0bb70 +index 000000000..a389be4ed --- /dev/null -+++ b/third_party/xla/0009-Add-dependency-on-proto_bazel_features.patch ++++ b/third_party/xla/0008-Add-dependency-on-proto_bazel_features.patch @@ -0,0 +1,72 @@ -+From 3178784d768554de923e1be09bd47a8c8dfa5926 Mon Sep 17 00:00:00 2001 ++From 11d99f37593033bfce14fd3336af3b4b853e9a40 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Fri, 12 Sep 2025 16:06:30 +0200 -+Subject: [PATCH 09/12] Add dependency on proto_bazel_features ++Subject: [PATCH 08/10] Add dependency on proto_bazel_features + +--- + workspace2.bzl | 4 +++- @@ -1046,7 +986,7 @@ index 0000000..cc0bb70 + 2 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/workspace2.bzl b/workspace2.bzl -+index a577783d44..6c70188ace 100644 ++index b2c5dda804..950e21cad7 100644 +--- a/workspace2.bzl ++++ b/workspace2.bzl +@@ -1,6 +1,7 @@ @@ -1056,8 +996,8 @@ index 0000000..cc0bb70 ++load("@proto_bazel_features//:deps.bzl", proto_bazel_features_deps = "bazel_features_deps") + load("@bazel_skylib//lib:versions.bzl", "versions") + load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external") -+ load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external") -+@@ -723,7 +724,8 @@ def workspace(): ++ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") ++@@ -688,7 +689,8 @@ def workspace(): + # written according to common practice to query native.existing_rule()). + _tf_repositories() + @@ -1107,56 +1047,26 @@ index 0000000..cc0bb70 + # Maven dependencies. + RULES_JVM_EXTERNAL_TAG = "4.3" + http_archive( -diff --git a/third_party/xla/0010-Update-gloo-version.patch b/third_party/xla/0010-Update-gloo-version.patch -new file mode 100644 -index 0000000..6657c48 ---- /dev/null -+++ b/third_party/xla/0010-Update-gloo-version.patch -@@ -0,0 +1,24 @@ -+From 2264ea2571f99a33056c81e2632ffde344201cf5 Mon Sep 17 00:00:00 2001 -+From: "Uwe L. Korn" -+Date: Mon, 15 Sep 2025 13:08:44 +0200 -+Subject: [PATCH 10/12] Update gloo version -+ -+--- -+ third_party/gloo/workspace.bzl | 4 ++-- -+ 1 file changed, 2 insertions(+), 2 deletions(-) -+ -+diff --git a/third_party/gloo/workspace.bzl b/third_party/gloo/workspace.bzl -+index ede168395a..64041780cd 100644 -+--- a/third_party/gloo/workspace.bzl -++++ b/third_party/gloo/workspace.bzl -+@@ -5,8 +5,8 @@ load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls") -+ def repo(): -+ """Imports Gloo.""" -+ -+- GLOO_COMMIT = "5354032ea08eadd7fc4456477f7f7c6308818509" -+- GLOO_SHA256 = "5759a06e6c8863c58e8ceadeb56f7c701fec89b2559ba33a103a447207bf69c7" -++ GLOO_COMMIT = "54cbae0d3a67fa890b4c3d9ee162b7860315e341" -++ GLOO_SHA256 = "61089361dbdbc9d6f75e297148369b13f615a3e6b78de1be56cce74ca2f64940" -+ -+ tf_http_archive( -+ name = "gloo", -diff --git a/third_party/xla/0011-Add-macos_x86_64-to-mkl_deps.patch b/third_party/xla/0011-Add-macos_x86_64-to-mkl_deps.patch +diff --git a/third_party/xla/0009-Add-macos_x86_64-to-mkl_deps.patch b/third_party/xla/0009-Add-macos_x86_64-to-mkl_deps.patch new file mode 100644 -index 0000000..0907f79 +index 000000000..7a6052118 --- /dev/null -+++ b/third_party/xla/0011-Add-macos_x86_64-to-mkl_deps.patch ++++ b/third_party/xla/0009-Add-macos_x86_64-to-mkl_deps.patch @@ -0,0 +1,21 @@ -+From 9eb91fcb7bcdeb14962fd5dfb91a3f1fb37a3c00 Mon Sep 17 00:00:00 2001 ++From bae66c93b3a45d1fe34404aa462f99c5147db16c Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Sat, 20 Sep 2025 08:15:14 +0200 -+Subject: [PATCH 11/12] Add macos_x86_64 to mkl_deps ++Subject: [PATCH 09/10] Add macos_x86_64 to mkl_deps + +--- + xla/tsl/mkl/build_defs.bzl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xla/tsl/mkl/build_defs.bzl b/xla/tsl/mkl/build_defs.bzl -+index d247197d46..bea4f8fc2e 100644 ++index d8bf659cd1..ba976572c1 100644 +--- a/xla/tsl/mkl/build_defs.bzl ++++ b/xla/tsl/mkl/build_defs.bzl -+@@ -107,6 +107,7 @@ def mkl_deps(): ++@@ -111,6 +111,7 @@ def mkl_deps(): + "@xla//xla/tsl/mkl:build_with_mkl_aarch64": ["@mkl_dnn_acl_compatible//:mkl_dnn_acl"], + "@xla//xla/tsl:linux_x86_64_with_onednn_async": ["@onednn_async//:mkl_dnn"], + "@xla//xla/tsl:linux_x86_64": ["@onednn//:mkl_dnn"], @@ -1164,16 +1074,16 @@ index 0000000..0907f79 + "@xla//xla/tsl:windows": ["@onednn//:mkl_dnn"], + "//conditions:default": [], + }) -diff --git a/third_party/xla/0012-Add-systemlib-for-oneDNN.patch b/third_party/xla/0012-Add-systemlib-for-oneDNN.patch +diff --git a/third_party/xla/0010-Add-systemlib-for-oneDNN.patch b/third_party/xla/0010-Add-systemlib-for-oneDNN.patch new file mode 100644 -index 0000000..a2a69d4 +index 000000000..012a458ad --- /dev/null -+++ b/third_party/xla/0012-Add-systemlib-for-oneDNN.patch ++++ b/third_party/xla/0010-Add-systemlib-for-oneDNN.patch @@ -0,0 +1,35 @@ -+From c524ab99bb701ff0169818a02049332da51dd359 Mon Sep 17 00:00:00 2001 ++From 0c2cf1a2fd4bf07d4411b703818f220f975a78b1 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Fri, 26 Sep 2025 17:23:37 +0200 -+Subject: [PATCH 12/12] Add systemlib for oneDNN ++Subject: [PATCH 10/10] Add systemlib for oneDNN + +--- + third_party/mkl_dnn/mkldnn_system.BUILD | 6 ++++++ @@ -1194,43 +1104,41 @@ index 0000000..a2a69d4 ++) ++ +diff --git a/workspace2.bzl b/workspace2.bzl -+index 6c70188ace..c30c4f7033 100644 ++index 950e21cad7..5b5a46112b 100644 +--- a/workspace2.bzl ++++ b/workspace2.bzl -+@@ -195,6 +195,7 @@ def _tf_repositories(): -+ name = "onednn", ++@@ -186,6 +186,7 @@ def _tf_repositories(): ++ name = "onednn_async", + build_file = "//third_party/mkl_dnn:mkldnn_v1.BUILD", + patch_file = ["//third_party/mkl_dnn:setting_init.patch"], ++ system_build_file = "//third_party/mkl_dnn:mkldnn_system.BUILD", -+ sha256 = "071f289dc961b43a3b7c8cbe8a305290a7c5d308ec4b2f586397749abdc88296", -+ strip_prefix = "oneDNN-3.7.3", -+ urls = tf_mirror_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/v3.7.3.tar.gz"), ++ sha256 = "1cfa18fad65b4c3b46ef701a83c64b87411d63e79c8549cdb37f8c1fc10e2398", ++ strip_prefix = "oneDNN-dev-v3.7-thunk-preview", ++ urls = tf_mirror_urls("https://github.com/oneapi-src/oneDNN/archive/refs/heads/dev-v3.7-thunk-preview.tar.gz"), diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl -index be345f8..f2c0bf0 100644 +index be345f8c6..8695ab300 100644 --- a/third_party/xla/workspace.bzl +++ b/third_party/xla/workspace.bzl -@@ -26,6 +26,20 @@ def repo(): +@@ -26,6 +26,18 @@ def repo(): # web links (`/archive/`) links so we use the GitHub API endpoint to get the tarball # instead. urls = tf_mirror_urls("https://api.github.com/repos/openxla/xla/tarball/{commit}".format(commit = XLA_COMMIT)), + patch_file = [ -+ "//third_party/xla:0001-Support-third-party-build-of-boringssl.patch", -+ "//third_party/xla:0002-Fix-abseil-headers.patch", -+ "//third_party/xla:0003-Omit-usage-of-StrFormat.patch", -+ "//third_party/xla:0004-Re-enable-system-abseil.patch", -+ "//third_party/xla:0005-Check-whether-absl-log-is-already-initialized.patch", -+ "//third_party/xla:0006-Unbundle-grpc.patch", -+ "//third_party/xla:0007-Disable-coordination_agent_recoverable-flag.patch", -+ "//third_party/xla:0008-absl_bad_-optional-variant-_access-is-now-header-onl.patch", -+ "//third_party/xla:0009-Add-dependency-on-proto_bazel_features.patch", -+ "//third_party/xla:0010-Update-gloo-version.patch", -+ "//third_party/xla:0011-Add-macos_x86_64-to-mkl_deps.patch", -+ "//third_party/xla:0012-Add-systemlib-for-oneDNN.patch", ++ "//third_party/xla:0001-Fix-abseil-headers.patch", ++ "//third_party/xla:0002-Omit-usage-of-StrFormat.patch", ++ "//third_party/xla:0003-Re-enable-system-abseil.patch", ++ "//third_party/xla:0004-Check-whether-absl-log-is-already-initialized.patch", ++ "//third_party/xla:0005-Unbundle-grpc.patch", ++ "//third_party/xla:0006-Disable-coordination_agent_recoverable-flag.patch", ++ "//third_party/xla:0007-absl_bad_-optional-variant-_access-is-now-header-onl.patch", ++ "//third_party/xla:0008-Add-dependency-on-proto_bazel_features.patch", ++ "//third_party/xla:0009-Add-macos_x86_64-to-mkl_deps.patch", ++ "//third_party/xla:0010-Add-systemlib-for-oneDNN.patch", + ], ) # For development, one often wants to make changes to the TF repository as well -@@ -39,4 +53,4 @@ def repo(): +@@ -39,4 +51,4 @@ def repo(): # local_repository( # name = "xla", # path = "/path/to/xla", diff --git a/recipe/patches/0003-avoid-mirror-that-doesn-t-seem-to-have-current-xla-a.patch b/recipe/patches/0003-avoid-mirror-that-doesn-t-seem-to-have-current-xla-a.patch index e44b616d..263f4954 100644 --- a/recipe/patches/0003-avoid-mirror-that-doesn-t-seem-to-have-current-xla-a.patch +++ b/recipe/patches/0003-avoid-mirror-that-doesn-t-seem-to-have-current-xla-a.patch @@ -1,4 +1,4 @@ -From 3d45c7e1f6615b54ff8f23bc94f3872d511f0027 Mon Sep 17 00:00:00 2001 +From d6079e8f4b31eae7179e07414474a2b92476e92c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 27 Jul 2025 10:42:28 +1100 Subject: [PATCH 3/4] avoid mirror that doesn't seem to have current xla @@ -10,7 +10,7 @@ and tell tf_http_archive to shut up about it 1 file changed, 15 deletions(-) diff --git a/third_party/repo.bzl b/third_party/repo.bzl -index 185c5a4..ae971cf 100644 +index f09875140..98dc0c1af 100644 --- a/third_party/repo.bzl +++ b/third_party/repo.bzl @@ -23,7 +23,6 @@ def tf_mirror_urls(url): diff --git a/recipe/patches/0004-re-enable-use_fast_cpp_protos-true.patch b/recipe/patches/0004-re-enable-use_fast_cpp_protos-true.patch index 8f428bb0..991a6124 100644 --- a/recipe/patches/0004-re-enable-use_fast_cpp_protos-true.patch +++ b/recipe/patches/0004-re-enable-use_fast_cpp_protos-true.patch @@ -1,4 +1,4 @@ -From 8dbab2b1165a13a3d047dcb879f8b2d5f0448445 Mon Sep 17 00:00:00 2001 +From f067df3c2e9fad8175167c14e668047d9ef45d3b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 31 Aug 2025 13:28:45 +1100 Subject: [PATCH 4/4] re-enable use_fast_cpp_protos=true @@ -8,15 +8,15 @@ Subject: [PATCH 4/4] re-enable use_fast_cpp_protos=true 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc -index b349564..882145c 100644 +index 0d79226bd..4c4b44db0 100644 --- a/.bazelrc +++ b/.bazelrc -@@ -121,7 +121,7 @@ build --repo_env=RULES_PYTHON_ENABLE_PYSTAR=0 +@@ -126,7 +126,7 @@ common --@rules_python//python/config_settings:precompile=force_disabled # of cc_binary shared libraries artifacts, which will mess with how we link # protobuf dependencies ourselves. By default this value is false, but some # projects enable it, which we don't want here. --# build --define=use_fast_cpp_protos=true -+build --define=use_fast_cpp_protos=true +-# common --define=use_fast_cpp_protos=true ++common --define=use_fast_cpp_protos=true - build:nonccl --define=no_nccl_support=true + common:nonccl --define=no_nccl_support=true From 72d1381655772c584c9d1ce7d8c30ed5727d904e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 Oct 2025 11:54:14 +0200 Subject: [PATCH 4/4] DEBUG: only py313 --- recipe/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index c915f16d..aae4376e 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -21,7 +21,7 @@ source: build: number: ${{ build if cuda_compiler_version == "None" else build + 200 }} string: ${{ "cpu" if cuda_compiler_version == "None" else "cuda" + (cuda_compiler_version | replace('.', '')) }}_py${{ python | version_to_buildstring }}h${{ hash }}_${{ build if cuda_compiler_version == "None" else build + 200 }} - skip: match(python, "<3.11") or win + skip: match(python, "!=3.13") or win requirements: build: