Skip to content

Commit 0b2038e

Browse files
authored
Merge pull request #170 from ROCm/ci-daily-sync-02-12-2024
CI: 12/02/24 upstream sync
2 parents c835a78 + f8b753c commit 0b2038e

File tree

105 files changed

+4546
-1474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+4546
-1474
lines changed

.bazelrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ build:macos_cache_push --config=macos_cache --remote_upload_local_results=true -
183183
build:ci_linux_x86_64 --config=avx_linux --config=avx_posix
184184
build:ci_linux_x86_64 --config=mkl_open_source_only
185185
build:ci_linux_x86_64 --config=clang --verbose_failures=true
186+
build:ci_linux_x86_64 --color=yes
186187

187188
# TODO(b/356695103): We do not have a CPU only toolchain so we use the CUDA
188189
# toolchain for both CPU and GPU builds.
@@ -203,6 +204,7 @@ build:ci_linux_x86_64_cuda --config=ci_linux_x86_64
203204
# Linux Aarch64 CI configs
204205
build:ci_linux_aarch64_base --config=clang --verbose_failures=true
205206
build:ci_linux_aarch64_base --action_env=TF_SYSROOT="/dt10"
207+
build:ci_linux_aarch64_base --color=yes
206208

207209
build:ci_linux_aarch64 --config=ci_linux_aarch64_base
208210
build:ci_linux_aarch64 --host_crosstool_top="@ml2014_clang_aarch64_config_aarch64//crosstool:toolchain"
@@ -221,18 +223,21 @@ build:ci_linux_aarch64_cuda --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm
221223
build:ci_darwin_x86_64 --macos_minimum_os=10.14
222224
build:ci_darwin_x86_64 --config=macos_cache_push
223225
build:ci_darwin_x86_64 --verbose_failures=true
226+
build:ci_darwin_x86_64 --color=yes
224227

225228
# Mac Arm64 CI configs
226229
build:ci_darwin_arm64 --macos_minimum_os=11.0
227230
build:ci_darwin_arm64 --config=macos_cache_push
228231
build:ci_darwin_arm64 --verbose_failures=true
232+
build:ci_darwin_arm64 --color=yes
229233

230234
# Windows x86 CI configs
231235
build:ci_windows_amd64 --config=avx_windows
232236
build:ci_windows_amd64 --compiler=clang-cl --config=clang --verbose_failures=true
233237
build:ci_windows_amd64 --crosstool_top="@xla//tools/toolchains/win/20240424:toolchain"
234238
build:ci_windows_amd64 --extra_toolchains="@xla//tools/toolchains/win/20240424:cc-toolchain-x64_windows-clang-cl"
235239
build:ci_windows_amd64 --host_linkopt=/FORCE:MULTIPLE --linkopt=/FORCE:MULTIPLE
240+
build:ci_windows_amd64 --color=yes
236241

237242
# #############################################################################
238243
# RBE config options below. These inherit the CI configs above and set the

.github/workflows/asan.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@ jobs:
2525
run:
2626
shell: bash -l {0}
2727
steps:
28-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
29-
with:
30-
path: jax
31-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32-
with:
33-
repository: python/cpython
34-
path: cpython
35-
ref: v3.13.0
28+
# Install git before actions/checkout as otherwise it will download the code with the GitHub
29+
# REST API and therefore any subsequent git commands will fail.
3630
- name: Install clang 18
3731
env:
3832
DEBIAN_FRONTEND: noninteractive
@@ -42,6 +36,14 @@ jobs:
4236
zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl git \
4337
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev \
4438
libffi-dev liblzma-dev
39+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
40+
with:
41+
path: jax
42+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
with:
44+
repository: python/cpython
45+
path: cpython
46+
ref: v3.13.0
4547
- name: Build CPython with ASAN enabled
4648
env:
4749
ASAN_OPTIONS: detect_leaks=0
@@ -65,7 +67,7 @@ jobs:
6567
run: |
6668
source ${GITHUB_WORKSPACE}/venv/bin/activate
6769
cd jax
68-
python build/build.py \
70+
python build/build.py build --wheels=jaxlib --verbose \
6971
--bazel_options=--color=yes \
7072
--bazel_options=--copt=-fsanitize=address \
7173
--clang_path=/usr/bin/clang-18

.github/workflows/ci-build.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
102102
documentation:
103103
name: Documentation - test code snippets
104-
runs-on: ubuntu-latest
104+
runs-on: ROCM-Ubuntu
105105
timeout-minutes: 10
106106
strategy:
107107
matrix:
@@ -164,8 +164,7 @@ jobs:
164164
pip install -r docs/requirements.txt
165165
- name: Render documentation
166166
run: |
167-
sphinx-build --color -W --keep-going -b html -D nb_execution_mode=off docs docs/build/html
168-
167+
sphinx-build -j auto --color -W --keep-going -b html -D nb_execution_mode=off docs docs/build/html
169168
170169
jax2tf_test:
171170
name: "jax2tf_test (py ${{ matrix.python-version }} on ${{ matrix.os }}, x64=${{ matrix.enable-x64}})"

.github/workflows/cloud-tpu-ci-nightly.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
strategy:
2525
fail-fast: false # don't cancel all jobs on failure
2626
matrix:
27-
jaxlib-version: ["pypi_latest", "nightly", "nightly+oldest_supported_libtpu"]
27+
jaxlib-version: ["head", "pypi_latest", "nightly", "nightly+oldest_supported_libtpu"]
2828
tpu: [
29-
# {type: "v3-8", cores: "4"}, # Enable when we have the v3/v4 type available
30-
# {type: "v4-8", cores: "4", runner: "linux-x86-ct4p-240-4tpu"},
29+
# {type: "v3-8", cores: "4"}, # Enable when we have the v3 type available
30+
{type: "v4-8", cores: "4", runner: "linux-x86-ct4p-240-4tpu"},
3131
{type: "v5e-8", cores: "8", runner: "linux-x86-ct5lp-224-8tpu"}
3232
]
3333
python-version: ["3.10"]
@@ -47,14 +47,34 @@ jobs:
4747
# mandates using a specific commit for non-Google actions. We use
4848
# https://github.com/sethvargo/ratchet to pin specific versions.
4949
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
50+
# Checkout XLA at head, if we're building jaxlib at head.
51+
- name: Checkout XLA at head
52+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
53+
if: ${{ matrix.jaxlib-version == 'head' }}
54+
with:
55+
repository: openxla/xla
56+
path: xla
5057
- name: Install JAX test requirements
5158
run: |
5259
$PYTHON -m pip install -U -r build/test-requirements.txt
5360
$PYTHON -m pip install -U -r build/collect-profile-requirements.txt
5461
- name: Install JAX
5562
run: |
5663
$PYTHON -m pip uninstall -y jax jaxlib libtpu
57-
if [ "${{ matrix.jaxlib-version }}" == "pypi_latest" ]; then
64+
if [ "${{ matrix.jaxlib-version }}" == "head" ]; then
65+
# Build and install jaxlib at head
66+
$PYTHON build/build.py --bazel_options=--config=rbe_linux_x86_64 \
67+
--bazel_options="--override_repository=xla=$(pwd)/xla" \
68+
--bazel_options=--color=yes
69+
$PYTHON -m pip install dist/*.whl
70+
71+
# Install "jax" at head
72+
$PYTHON -m pip install -U -e .
73+
74+
# Install libtpu
75+
$PYTHON -m pip install --pre libtpu \
76+
-f https://storage.googleapis.com/jax-releases/libtpu_releases.html
77+
elif [ "${{ matrix.jaxlib-version }}" == "pypi_latest" ]; then
5878
$PYTHON -m pip install .[tpu] \
5979
-f https://storage.googleapis.com/jax-releases/libtpu_releases.html
6080

.github/workflows/wheel_win_x64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
python -m pip install -r build/test-requirements.txt
4141
python -m pip install --upgrade numpy==2.0.0 scipy==1.13.1
4242
"C:\\msys64\\;C:\\msys64\\usr\\bin\\;" >> $env:GITHUB_PATH
43-
python.exe build\build.py `
43+
python.exe build\build.py build --wheels=jaxlib `
4444
--bazel_options=--color=yes `
4545
--bazel_options=--config=win_clang `
4646
--verbose

.github/workflows/windows_ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ jobs:
4949
python -m pip install -r build/test-requirements.txt
5050
python -m pip install --upgrade numpy==2.0.0 scipy==1.13.1
5151
"C:\\msys64\\;C:\\msys64\\usr\\bin\\;" >> $env:GITHUB_PATH
52-
python.exe build\build.py `
52+
python.exe build\build.py build --wheels=jaxlib `
5353
--bazel_options=--color=yes `
54-
--bazel_options=--config=win_clang
54+
--bazel_options=--config=win_clang `
55+
--verbose
5556
5657
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
5758
with:

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ When releasing, please add the new-release-boilerplate to docs/pallas/CHANGELOG.
5555
`platforms` instead.
5656
* Hashing of tracers, which has been deprecated since version 0.4.30, now
5757
results in a `TypeError`.
58+
* Refactor: JAX build CLI (build/build.py) now uses a subcommand structure and
59+
replaces previous build.py usage. Run `python build/build.py --help` for
60+
more details. Brief overview of the new subcommand options:
61+
* `build`: Builds JAX wheel packages. For e.g., `python build/build.py build --wheels=jaxlib,jax-cuda-pjrt`
62+
* `requirements_update`: Updates requirements_lock.txt files.
5863
* {func}`jax.scipy.linalg.toeplitz` now does implicit batching on multi-dimensional
5964
inputs. To recover the previous behavior, you can call {func}`jax.numpy.ravel`
6065
on the function inputs.

0 commit comments

Comments
 (0)