Skip to content

Commit

Permalink
jaxlib 0.4.24
Browse files Browse the repository at this point in the history
  • Loading branch information
xhochy committed Jun 15, 2024
1 parent 9bc9f0e commit 30b9846
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 25 deletions.
2 changes: 1 addition & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if [[ "${cuda_compiler_version:-None}" != "None" ]]; then
--cudnn_version=$TF_CUDNN_VERSION"
fi

if [[ "$CI" == "github_actions" ]]; then
if [[ "${CI:-}" == "github_actions" ]]; then
export CPU_COUNT=2
fi

Expand Down
8 changes: 4 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "0.4.23" %}
{% set number = 2 %}
{% set version = "0.4.24" %}
{% set number = 0 %}

{% if cuda_compiler_version != "None" %}
{% set number = number + 200 %}
Expand All @@ -13,11 +13,11 @@ package:
source:
# only pull sources after upstream PyPI release...
url: https://github.com/google/jax/archive/jaxlib-v{{ version }}.tar.gz
sha256: e4c06d62ba54becffd91abc862627b8b11b79c5a77366af8843b819665b6d568
sha256: c4e6963c2c36f634a9a1765e476a1ed4e6c4a7954465ebf72e29f344c28ddc28
patches:
- patches/0001-Allow-for-custom-CUDA-build.patch
- patches/0002-xla-Support-third-party-build-of-boringssl.patch
- patches/0001-xla-Fix-abseil-headers.patch
- patches/0003-xla-Fix-abseil-headers.patch

build:
number: {{ number }}
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0001-Allow-for-custom-CUDA-build.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From 17365058809e185821f928813d79c61ac0a4bcaf Mon Sep 17 00:00:00 2001
From fd46cfdb440683ba9a4d3b382d0729c557fb33ab 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
Subject: [PATCH 1/3] 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 41994c4..51d2ddc 100755
index dfdf33e..fe1da3c 100755
--- a/build/build.py
+++ b/build/build.py
@@ -251,6 +251,11 @@ def write_bazelrc(*, python_bin_path, remote_build,
@@ -299,6 +299,11 @@ def write_bazelrc(*, python_bin_path, remote_build,
f.write("build --action_env TF_CUDA_PATHS=\"{tf_cuda_paths}\"\n"
.format(tf_cuda_paths=",".join(tf_cuda_paths)))
if cuda_version:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 3eadf03384f6967042a8f5c48c541cafbf784132 Mon Sep 17 00:00:00 2001
From c7a275fc1ec8a7a79d4eaa7cad4204b1aedfe37b 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] xla: Support third-party build of boringssl
Subject: [PATCH 2/3] xla: Support third-party build of boringssl

---
...pport-third-party-build-of-boringssl.patch | 54 +++++++++++++++++++
third_party/xla/workspace.bzl | 5 +-
2 files changed, 58 insertions(+), 1 deletion(-)
third_party/xla/workspace.bzl | 3 ++
2 files changed, 57 insertions(+)
create mode 100644 third_party/xla/0001-Support-third-party-build-of-boringssl.patch

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
Expand Down Expand Up @@ -70,16 +70,14 @@ index 0000000..1f11444
+2.43.0
+
diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl
index a6f972c..456a0a8 100644
index 0b09fa9..b81e13a 100644
--- a/third_party/xla/workspace.bzl
+++ b/third_party/xla/workspace.bzl
@@ -29,7 +29,10 @@ def repo():
@@ -29,6 +29,9 @@ def repo():
sha256 = XLA_SHA256,
strip_prefix = "xla-{commit}".format(commit = XLA_COMMIT),
urls = tf_mirror_urls("https://github.com/openxla/xla/archive/{commit}.tar.gz".format(commit = XLA_COMMIT)),
- patch_file = ["//third_party/xla:log.patch"],
+ patch_file = [
+ "//third_party/xla:log.patch",
+ "//third_party/xla:0001-Support-third-party-build-of-boringssl.patch",
+ ],
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f14f07e11324414f007b9aa3dfc125c4dbb357f0 Mon Sep 17 00:00:00 2001
From 3c66e397754fd18c003eb047bf48593dd5a4cee5 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Sun, 11 Feb 2024 20:18:13 +0100
Subject: [PATCH] xla: Fix abseil headers
Subject: [PATCH 3/3] xla: Fix abseil headers

---
third_party/xla/0001-Fix-abseil-headers.patch | 47 +++++++++++++++++++
Expand Down Expand Up @@ -63,17 +63,14 @@ index 0000000..41f411e
+2.43.0
+
diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl
index 456a0a8..a1bc834 100644
index b81e13a..9671b9b 100644
--- a/third_party/xla/workspace.bzl
+++ b/third_party/xla/workspace.bzl
@@ -32,6 +32,7 @@ def repo():
@@ -31,6 +31,7 @@ def repo():
urls = tf_mirror_urls("https://github.com/openxla/xla/archive/{commit}.tar.gz".format(commit = XLA_COMMIT)),
patch_file = [
"//third_party/xla:log.patch",
"//third_party/xla:0001-Support-third-party-build-of-boringssl.patch",
+ "//third_party/xla:0001-Fix-abseil-headers.patch",
],
)

--
2.39.3 (Apple Git-145)

0 comments on commit 30b9846

Please sign in to comment.