Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jaxlib v0.5.1 #305

Merged
merged 5 commits into from
Feb 27, 2025
Merged

jaxlib v0.5.1 #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2ca0ff
updated v0.5.1
regro-cf-autotick-bot Feb 24, 2025
7089454
rebase patches
h-vetinari Feb 25, 2025
c471375
bump to macos 10.15 for aligned_alloc; drop obsolete pins
h-vetinari Feb 25, 2025
4f2fab2
add absl_log:globals wrapper in xla
h-vetinari Feb 25, 2025
76dbb21
MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.5.dev18+g…
h-vetinari Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.14'
- '10.15'
MACOSX_SDK_VERSION:
- '10.14'
- '10.15'
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.14'
- '10.15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
10 changes: 5 additions & 5 deletions .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.14'
- '10.15'
MACOSX_SDK_VERSION:
- '10.14'
- '10.15'
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.14'
- '10.15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
10 changes: 5 additions & 5 deletions .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.14'
- '10.15'
MACOSX_SDK_VERSION:
- '10.14'
- '10.15'
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.14'
- '10.15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
10 changes: 5 additions & 5 deletions .ci_support/osx_64_numpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.14'
- '10.15'
MACOSX_SDK_VERSION:
- '10.14'
- '10.15'
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.14'
- '10.15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '17'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -23,7 +23,7 @@ cudnn:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '17'
- '18'
github_actions_labels:
- cirun-openstack-cpu-large
libabseil:
Expand Down
3 changes: 0 additions & 3 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/bin/bash
set -euxo pipefail

# see comment in meta.yaml
cp $RECIPE_DIR/patches/0007-xla-cpu-Fix-build-errors-from-ACL.patch $SRC_DIR/third_party/xla/

export JAX_RELEASE=$PKG_VERSION

$RECIPE_DIR/add_py_toolchain.sh
Expand Down
10 changes: 1 addition & 9 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
# Otherwise __ZN4absl12lts_2024072212log_internal10LogMessagelsIPKvTnNSt3__19enable_ifIXntsr4absl16HasAbslStringifyIT_EE5valueEiE4typeELi0EEERS2_RKS8_ cannot be found
# demangled: absl::lts_20240722::log_internal::LogMessage& absl::lts_20240722::log_internal::LogMessage::operator<<<void const*, 0>(void const* const&)
c_compiler_version: # [osx]
- '17' # [osx]
cxx_compiler_version: # [osx]
- '17' # [osx]
MACOSX_SDK_VERSION: # [osx and x86_64]
- '10.14' # [osx and x86_64]
c_stdlib_version: # [osx and x86_64]
- '10.14' # [osx and x86_64]
- '10.15' # [osx and x86_64]
github_actions_labels:
- cirun-openstack-cpu-large
11 changes: 3 additions & 8 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "0.5.0" %}
{% set version = "0.5.1" %}
{% set build = 0 %}

{% if cuda_compiler_version != "None" %}
Expand All @@ -13,19 +13,14 @@ package:
source:
# only pull sources after upstream PyPI release...
url: https://github.com/jax-ml/jax/archive/jax-v{{ version }}.tar.gz
sha256: 04cc2eeb2e7ce1916674cea03a7d75a59d583ddb779d5104e103a2798a283ce9
sha256: e74b1209517682075933f757d646b73040d09fe39ee3e9e4cd398407dd0902d2
patches:
- patches/0001-Allow-for-custom-CUDA-build.patch
- patches/0002-Consolidated-build-fixes-for-XLA.patch
# cannot absorb this into the overall xla patch, because patching three vendored projects
# deep breaks the application of the patch using `patch` (presumably due to lines starting
# legitimately with `+++` being misinterpreted as a hunk separator).
# - patches/0007-xla-cpu-Fix-build-errors-from-ACL.patch
# backport https://github.com/jax-ml/jax/pull/26691
- patches/0003-fix-member-access-to-packed-CUDA-struct.patch
- patches/0004-fix-an-ambiguous-type.patch
# backport https://github.com/jax-ml/jax/pull/26690
- patches/0005-fix-getting-gcc-major-version.patch
- patches/0004-fix-getting-gcc-major-version.patch

build:
number: {{ build }}
Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0001-Allow-for-custom-CUDA-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From f8e41b61ce27bf6bc28a10703ddfceea39d650ed Mon Sep 17 00:00:00 2001
From c97dee8337618e173ed5d617eb67deabdda026c5 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/5] Allow for custom CUDA build
Subject: [PATCH 1/4] Allow for custom CUDA build

---
build/build.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/build/build.py b/build/build.py
index d2f68f80e..4fbb675fc 100755
index 0df7d646f..6b9690ca1 100755
--- a/build/build.py
+++ b/build/build.py
@@ -548,6 +548,13 @@ async def main():
@@ -549,6 +549,13 @@ async def main():

if args.cuda_version:
logging.debug("Hermetic CUDA version: %s", args.cuda_version)
Expand All @@ -25,7 +25,7 @@ index d2f68f80e..4fbb675fc 100755
wheel_build_command_base.append(
f"--repo_env=HERMETIC_CUDA_VERSION={args.cuda_version}"
)
@@ -653,10 +660,9 @@ async def main():
@@ -656,10 +663,9 @@ async def main():

wheel_build_command.append(f"--jaxlib_git_hash={git_hash}")

Expand Down
Loading