diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8b4aef24..e8e27088 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,9 +17,6 @@ jobs: osx_64_numpy2.0python3.12.____cpython: CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.9.____cpython: - CONFIG: osx_64_numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_numpy2.0python3.10.____cpython: CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -29,9 +26,6 @@ jobs: osx_arm64_numpy2.0python3.12.____cpython: CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.9.____cpython: - CONFIG: osx_arm64_numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml deleted file mode 100644 index d21094ab..00000000 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,60 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -github_actions_labels: -- cirun-openstack-cpu-large -libabseil: -- '20240116' -libgrpc: -- '1.62' -libprotobuf: -- 4.25.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython.yaml deleted file mode 100644 index 0dcc6f4b..00000000 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,60 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.0' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -github_actions_labels: -- cirun-openstack-cpu-large -libabseil: -- '20240116' -libgrpc: -- '1.62' -libprotobuf: -- 4.25.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml deleted file mode 100644 index 08ed4195..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,62 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -github_actions_labels: -- cirun-openstack-cpu-large -libabseil: -- '20240116' -libgrpc: -- '1.62' -libprotobuf: -- 4.25.3 -numpy: -- '2.0' -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml deleted file mode 100644 index aab5a64b..00000000 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.14' -MACOSX_SDK_VERSION: -- '10.14' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -github_actions_labels: -- cirun-openstack-cpu-large -libabseil: -- '20240116' -libgrpc: -- '1.62' -libprotobuf: -- 4.25.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '2.0' -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml deleted file mode 100644 index 4b9f773d..00000000 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -github_actions_labels: -- cirun-openstack-cpu-large -libabseil: -- '20240116' -libgrpc: -- '1.62' -libprotobuf: -- 4.25.3 -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '2.0' -openssl: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy -zlib: -- '1' diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 1c9b42e6..76259c71 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -36,11 +36,6 @@ jobs: os: ubuntu runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hfb26e6205b', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h148e7aa45e', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu @@ -56,11 +51,6 @@ jobs: os: ubuntu runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h2302987719', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h1358ee83cf', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu @@ -76,11 +66,6 @@ jobs: os: ubuntu runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_c_compiler_version12c_h3ad2a43107', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_c_compiler_version12c_h053dcd3527', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: - name: Checkout code diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8d..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/README.md b/README.md index f35836a0..dc0df2d8 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,6 @@ Current build status variant - - linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython - - - variant - - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpython @@ -77,13 +70,6 @@ Current build status variant - - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython - - - variant - - linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython @@ -105,13 +91,6 @@ Current build status variant - - linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython - - - variant - - osx_64_numpy2.0python3.10.____cpython @@ -133,13 +112,6 @@ Current build status variant - - osx_64_numpy2.0python3.9.____cpython - - - variant - - osx_arm64_numpy2.0python3.10.____cpython @@ -161,13 +133,6 @@ Current build status variant - - osx_arm64_numpy2.0python3.9.____cpython - - - variant - - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 48579dbc..c933bb3a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.4.30" %} +{% set version = "0.4.31" %} {% set build = 0 %} {% if cuda_compiler_version != "None" %} @@ -13,14 +13,14 @@ package: source: # only pull sources after upstream PyPI release... url: https://github.com/google/jax/archive/jaxlib-v{{ version }}.tar.gz - sha256: 0ef9635c734d9bbb44fcc87df4f1c3ccce1cfcfd243572c80d36fcdf826fe1e6 + sha256: 022ea1347f9b21cbea31410b3d650d976ea4452a48ea7317a5f91c238031bf94 patches: - patches/0001-Allow-for-custom-CUDA-build.patch - patches/0002-Consolidated-build-fixes-for-XLA.patch build: number: {{ build }} - skip: true # [win or py<39] + skip: true # [win or py<310] skip: true # [cuda_compiler != "None" and aarch64] # Currently the GPU kernels (and their abseil includes) are not compatible with GCC 11 skip: true # [cuda_compiler_version == "11.8"] diff --git a/recipe/patches/0001-Allow-for-custom-CUDA-build.patch b/recipe/patches/0001-Allow-for-custom-CUDA-build.patch index 3993d30a..484c4c39 100644 --- a/recipe/patches/0001-Allow-for-custom-CUDA-build.patch +++ b/recipe/patches/0001-Allow-for-custom-CUDA-build.patch @@ -1,14 +1,14 @@ -From e61eb1329c100625a8b738c0b3be4f1aa0e83958 Mon Sep 17 00:00:00 2001 +From 1daa8cc30c7c2d70a71aa164d9ecb5923b34e0c0 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 8 Oct 2023 19:34:34 +0200 -Subject: [PATCH 1/3] Allow for custom CUDA build +Subject: [PATCH 1/2] Allow for custom CUDA build --- build/build.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/build.py b/build/build.py -index d525c36fb..0c25cea16 100755 +index 2f6822281..0000dbbf8 100755 --- a/build/build.py +++ b/build/build.py @@ -277,6 +277,11 @@ def write_bazelrc(*, remote_build, diff --git a/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch b/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch index 1c413936..5722a364 100644 --- a/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch +++ b/recipe/patches/0002-Consolidated-build-fixes-for-XLA.patch @@ -1,7 +1,7 @@ -From ca3d33235324032170482c4b60a5f489c5372223 Mon Sep 17 00:00:00 2001 +From 3967a662a3cb00e8144628ba021116ee59d74134 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 17:06:15 +0100 -Subject: [PATCH 2/3] Consolidated build fixes for XLA +Subject: [PATCH 2/2] Consolidated build fixes for XLA jax vendors xla, but only populates the sources through bazel, so we cannot patch as usual through conda, but rather need to teach the bazel build file @@ -11,13 +11,15 @@ To maintain/rebase these patches, use a checkout of https://github.com/openxla/x 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 which is also where we're patching in the list of patches to apply to xla. + +Co-Authored-By: H. Vetinari --- - ...pport-third-party-build-of-boringssl.patch | 51 +++++++ - third_party/xla/0002-Fix-abseil-headers.patch | 73 +++++++++ - .../xla/0003-Omit-usage-of-StrFormat.patch | 43 ++++++ - ...0004-Add-missing-bits-absl-systemlib.patch | 141 ++++++++++++++++++ + ...pport-third-party-build-of-boringssl.patch | 51 ++++ + third_party/xla/0002-Fix-abseil-headers.patch | 73 ++++++ + .../xla/0003-Omit-usage-of-StrFormat.patch | 43 ++++ + ...0004-Add-missing-bits-absl-systemlib.patch | 226 ++++++++++++++++++ third_party/xla/workspace.bzl | 6 + - 5 files changed, 314 insertions(+) + 5 files changed, 399 insertions(+) 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 @@ -25,11 +27,11 @@ which is also where we're patching in the list of patches to apply to xla. 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 000000000..d51972ceb +index 000000000..e24a45e1f --- /dev/null +++ b/third_party/xla/0001-Support-third-party-build-of-boringssl.patch @@ -0,0 +1,51 @@ -+From a319c974acb4e6dbd0851692d2bd2cfc2900fab0 Mon Sep 17 00:00:00 2001 ++From 876bfe566992d7829dc4fdb82de72ff2c622f015 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 14 Dec 2023 15:04:51 +0100 +Subject: [PATCH 1/4] Support third-party build of boringssl @@ -68,10 +70,10 @@ index 000000000..d51972ceb ++ ], ++) +diff --git a/workspace2.bzl b/workspace2.bzl -+index b61970b831..6159edcf66 100644 ++index 5c9d465040..69dfa954b3 100644 +--- a/workspace2.bzl ++++ b/workspace2.bzl -+@@ -65,7 +65,7 @@ def _tf_repositories(): ++@@ -67,7 +67,7 @@ def _tf_repositories(): + name = "boringssl", + sha256 = "9dc53f851107eaf87b391136d13b815df97ec8f76dadb487b58b2fc45e624d2c", + strip_prefix = "boringssl-c00d7ca810e93780bd0c8ee4eea28f4f2ea4bcdc", @@ -82,11 +84,11 @@ index 000000000..d51972ceb + 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 000000000..23e30e232 +index 000000000..7a58075e1 --- /dev/null +++ b/third_party/xla/0002-Fix-abseil-headers.patch @@ -0,0 +1,73 @@ -+From 96092fef5b5de38eae41f3a15e32160b774f334b Mon Sep 17 00:00:00 2001 ++From adc3749cd0a77a502c9ffd9c558dbee96c1fc0ab Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 23 May 2024 15:45:52 +0200 +Subject: [PATCH 2/4] Fix abseil headers @@ -99,7 +101,7 @@ index 000000000..23e30e232 + 4 files changed, 10 insertions(+) + +diff --git a/third_party/tsl/tsl/platform/default/BUILD b/third_party/tsl/tsl/platform/default/BUILD -+index 223d85bfd8..522faf967a 100644 ++index 01cf593888..ba5b5cc068 100644 +--- a/third_party/tsl/tsl/platform/default/BUILD ++++ b/third_party/tsl/tsl/platform/default/BUILD +@@ -220,6 +220,8 @@ cc_library( @@ -134,7 +136,7 @@ index 000000000..23e30e232 + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", +diff --git a/xla/python/ifrt_proxy/common/BUILD b/xla/python/ifrt_proxy/common/BUILD -+index a585d9f38b..045039c6e2 100644 ++index 969ab1ce7a..5009078dcb 100644 +--- a/xla/python/ifrt_proxy/common/BUILD ++++ b/xla/python/ifrt_proxy/common/BUILD +@@ -52,6 +52,9 @@ cc_library( @@ -161,11 +163,11 @@ index 000000000..23e30e232 + "@tsl//tsl/platform:status", 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 000000000..55227e995 +index 000000000..541c06f40 --- /dev/null +++ b/third_party/xla/0003-Omit-usage-of-StrFormat.patch @@ -0,0 +1,43 @@ -+From 5e3d79f182977ddd06e0cbdd66d907709e453189 Mon Sep 17 00:00:00 2001 ++From 8434fbb499a3c035c9b028f1500b01229ce04a4a Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 4 Jul 2024 10:36:03 +0200 +Subject: [PATCH 3/4] Omit usage of StrFormat @@ -175,18 +177,18 @@ index 000000000..55227e995 + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/xla/stream_executor/gpu/gpu_executor.h b/xla/stream_executor/gpu/gpu_executor.h -+index 31398f60ce..4f00b2d317 100644 ++index c19fa1ccee..c1565b864e 100644 +--- a/xla/stream_executor/gpu/gpu_executor.h ++++ b/xla/stream_executor/gpu/gpu_executor.h -+@@ -29,6 +29,7 @@ limitations under the License. ++@@ -28,6 +28,7 @@ limitations under the License. ++ #include + #include -+ #include + #include ++#include + #include + #include + -+@@ -38,7 +39,6 @@ limitations under the License. ++@@ -37,7 +38,6 @@ limitations under the License. + #include "absl/numeric/int128.h" + #include "absl/status/status.h" + #include "absl/status/statusor.h" @@ -194,7 +196,7 @@ index 000000000..55227e995 + #include "absl/synchronization/mutex.h" + #include "absl/types/span.h" + #include "xla/stream_executor/blas.h" -+@@ -186,8 +186,11 @@ class GpuExecutor : public StreamExecutorCommon { ++@@ -177,8 +177,11 @@ class GpuExecutor : public StreamExecutorCommon { + uint64_t size) override { + auto* buffer = GpuDriver::HostAllocate(context_, size); + if (buffer == nullptr && size > 0) { @@ -210,21 +212,24 @@ index 000000000..55227e995 + } 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 000000000..12bee2fdd +index 000000000..e151c23c8 --- /dev/null +++ b/third_party/xla/0004-Add-missing-bits-absl-systemlib.patch -@@ -0,0 +1,141 @@ -+From 2e788307dfb10d322125f0b0fe9b36b6686fba85 Mon Sep 17 00:00:00 2001 +@@ -0,0 +1,226 @@ ++From f43652257c58896305d13c6dc9829c9f3f522a8f Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 4 Jul 2024 15:58:32 +0200 +Subject: [PATCH 4/4] Add missing bits absl systemlib + ++Co-Authored-By: H. Vetinari +--- -+ .../third_party/absl/system.absl.base.BUILD | 16 ++++++ -+ .../third_party/absl/system.absl.log.BUILD | 56 +++++++++++++++++++ ++ .../third_party/absl/system.absl.base.BUILD | 16 +++++ ++ .../third_party/absl/system.absl.crc.BUILD | 70 +++++++++++++++++++ ++ .../third_party/absl/system.absl.log.BUILD | 56 +++++++++++++++ + .../absl/system.absl.strings.BUILD | 12 ++++ -+ .../tsl/third_party/absl/workspace.bzl | 1 + -+ 4 files changed, 85 insertions(+) ++ .../tsl/third_party/absl/workspace.bzl | 2 + ++ 5 files changed, 156 insertions(+) ++ create mode 100644 third_party/tsl/third_party/absl/system.absl.crc.BUILD + create mode 100644 third_party/tsl/third_party/absl/system.absl.log.BUILD + +diff --git a/third_party/tsl/third_party/absl/system.absl.base.BUILD b/third_party/tsl/third_party/absl/system.absl.base.BUILD @@ -258,6 +263,82 @@ index 000000000..12bee2fdd ++ ":core_headers", ++ ], ++) ++diff --git a/third_party/tsl/third_party/absl/system.absl.crc.BUILD b/third_party/tsl/third_party/absl/system.absl.crc.BUILD ++new file mode 100644 ++index 0000000000..487c36ff45 ++--- /dev/null +++++ b/third_party/tsl/third_party/absl/system.absl.crc.BUILD ++@@ -0,0 +1,70 @@ +++load("@rules_cc//cc:defs.bzl", "cc_library") +++ +++package(default_visibility = ["//visibility:public"]) +++ +++cc_library( +++ name = "crc32c", +++ linkopts = [ +++ "-labsl_crc32c", +++ "-labsl_crc_cord_state", +++ "-labsl_crc_cpu_detect", +++ "-labsl_crc_internal", +++ ], +++ deps = [ +++ ":cpu_detect", +++ ":crc_internal", +++ ":non_temporal_memcpy", +++ "//absl/base:config", +++ "//absl/base:core_headers", +++ "//absl/base:endian", +++ "//absl/base:prefetch", +++ "//absl/strings", +++ "//absl/strings:str_format", +++ ], +++) +++ +++cc_library( +++ name = "cpu_detect", +++ visibility = ["//visibility:private"], +++ deps = [ +++ "//absl/base", +++ "//absl/base:config", +++ ], +++) +++ +++cc_library( +++ name = "crc_internal", +++ visibility = ["//visibility:private"], +++ deps = [ +++ ":cpu_detect", +++ "//absl/base:config", +++ "//absl/base:core_headers", +++ "//absl/base:endian", +++ "//absl/base:prefetch", +++ "//absl/base:raw_logging_internal", +++ "//absl/memory", +++ "//absl/numeric:bits", +++ ], +++) +++ +++cc_library( +++ name = "non_temporal_memcpy", +++ visibility = [ +++ ":__pkg__", +++ ], +++ deps = [ +++ ":non_temporal_arm_intrinsics", +++ "//absl/base:config", +++ "//absl/base:core_headers", +++ ], +++) +++ +++cc_library( +++ name = "non_temporal_arm_intrinsics", +++ visibility = [ +++ ":__pkg__", +++ ], +++ deps = [ +++ "//absl/base:config", +++ ], +++) +diff --git a/third_party/tsl/third_party/absl/system.absl.log.BUILD b/third_party/tsl/third_party/absl/system.absl.log.BUILD +new file mode 100644 +index 0000000000..90b2ada6cf @@ -344,10 +425,16 @@ index 000000000..12bee2fdd + name = "strings", + linkopts = ["-labsl_strings"], +diff --git a/third_party/tsl/third_party/absl/workspace.bzl b/third_party/tsl/third_party/absl/workspace.bzl -+index 06f75166ce..c54df3cfba 100644 ++index 06f75166ce..446dbc4081 100644 +--- a/third_party/tsl/third_party/absl/workspace.bzl ++++ b/third_party/tsl/third_party/absl/workspace.bzl -+@@ -20,6 +20,7 @@ def repo(): ++@@ -15,11 +15,13 @@ def repo(): ++ "algorithm", ++ "base", ++ "cleanup", +++ "crc", ++ "container", ++ "debugging", + "flags", + "functional", + "hash", @@ -356,7 +443,7 @@ index 000000000..12bee2fdd + "meta", + "numeric", diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl -index 3e8b0411e..230152817 100644 +index af52e7671..76fb83680 100644 --- a/third_party/xla/workspace.bzl +++ b/third_party/xla/workspace.bzl @@ -30,6 +30,12 @@ def repo():