Skip to content

Commit f47460e

Browse files
400Ping400Ping
authored
Merge branch 'master' into data/fix-pytorch_resnet_batch_prediction-flaky
2 parents 36e3dc8 + 9f19049 commit f47460e

File tree

646 files changed

+33331
-11699
lines changed

Some content is hidden

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

646 files changed

+33331
-11699
lines changed

‎.buildkite/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@py_deps_buildkite//:requirements.bzl", ci_require = "requirement")
1+
load("@py_deps_py310//:requirements.bzl", ci_require = "requirement")
22
load("@rules_python//python:defs.bzl", "py_binary")
33

44
py_binary(

‎.buildkite/_images.rayci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
- "3.12"
1515
env:
1616
PYTHON_VERSION: "{{matrix}}"
17+
REQUIREMENTS_FILE: "ray_base_deps_py{{matrix}}.lock"
1718
ARCH_SUFFIX: ""
1819

1920
- name: raycpubaseextra
@@ -56,6 +57,7 @@ steps:
5657
env:
5758
PYTHON_VERSION: "{{matrix.python}}"
5859
CUDA_VERSION: "{{matrix.cuda}}"
60+
REQUIREMENTS_FILE: "ray_base_deps_py{{matrix.python}}.lock"
5961
ARCH_SUFFIX: ""
6062

6163
- name: raycudabaseextra

‎.buildkite/build.rayci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ steps:
4242
commands:
4343
- bazel run //ci/ray_ci:build_in_docker -- wheel --python-version {{matrix}} --architecture x86_64 --upload
4444
matrix:
45+
- "3.9"
4546
- "3.10"
4647
- "3.11"
4748
- "3.12"

‎.buildkite/data.rayci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ steps:
145145
- data
146146
- skip-on-premerge
147147
- oss
148+
- disabled
148149
instance_type: medium
149150
parallelism: 2
150151
commands:
@@ -161,6 +162,7 @@ steps:
161162
- data
162163
- skip-on-premerge
163164
- oss
165+
- disabled
164166
instance_type: medium
165167
commands:
166168
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... //python/ray/air/... data

‎.buildkite/doc.rayci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ steps:
7575
key: doc_api_policy_check
7676
instance_type: medium
7777
depends_on: docbuild
78-
# TODO(aslonnie): migrate to Python 3.12
79-
job_env: docbuild-py3.9
78+
job_env: docbuild-py3.10
8079
commands:
8180
- bash ci/lint/lint.sh api_policy_check
8281

‎.buildkite/linux_aarch64.rayci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ steps:
3939
env:
4040
PYTHON_VERSION: "{{matrix}}"
4141
ARCH_SUFFIX: "-aarch64"
42+
REQUIREMENTS_FILE: "ray_base_deps_py{{matrix}}.lock"
4243

4344
- name: raycpubaseextra-aarch64
4445
label: "wanda: ray.py{{matrix}}.cpu.base-extra (aarch64)"
@@ -81,6 +82,7 @@ steps:
8182
PYTHON_VERSION: "{{matrix.python}}"
8283
CUDA_VERSION: "{{matrix.cuda}}"
8384
ARCH_SUFFIX: "-aarch64"
85+
REQUIREMENTS_FILE: "ray_base_deps_py{{matrix.python}}.lock"
8486

8587
- name: raycudabaseextra-aarch64
8688
label: "wanda: ray.py{{matrix.python}}.cu{{matrix.cuda}}.base-extra (aarch64)"

‎.buildkite/release-automation/forge_arm64.Dockerfile‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3-labs
22

3-
FROM ubuntu:20.04
3+
FROM ubuntu:22.04
44

55
ENV DEBIAN_FRONTEND=noninteractive
66

@@ -16,17 +16,37 @@ apt-get install -y curl zip clang-12
1616
ln -s /usr/bin/clang-12 /usr/bin/clang
1717

1818
# Install miniforge3
19-
curl -sfL https://github.com/conda-forge/miniforge/releases/download/25.3.0-1/Miniforge3-25.3.0-1-Linux-aarch64.sh > /tmp/miniforge3.sh
19+
curl -fsSL https://github.com/conda-forge/miniforge/releases/download/25.3.0-1/Miniforge3-25.3.0-1-Linux-aarch64.sh > /tmp/miniforge3.sh
2020
bash /tmp/miniforge3.sh -b -u -p /usr/local/bin/miniforge3
2121
rm /tmp/miniforge3.sh
2222
/usr/local/bin/miniforge3/bin/conda init bash
2323

2424
# Install Bazelisk
25-
curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-arm64 --output /usr/local/bin/bazelisk
25+
curl -fsSL https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-arm64 --output /usr/local/bin/bazelisk
2626
chmod +x /usr/local/bin/bazelisk
2727

2828
ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel
2929

30+
# Install uv
31+
curl -fsSL https://astral.sh/uv/install.sh | env UV_UNMANAGED_INSTALL="/usr/local/bin" sh
32+
33+
mkdir -p /usr/local/python
34+
# Install Python using uv
35+
UV_PYTHON_VERSION=3.10
36+
uv python install --install-dir /usr/local/python "$UV_PYTHON_VERSION"
37+
38+
export UV_PYTHON_INSTALL_DIR=/usr/local/python
39+
# Make Python from uv the default by creating symlinks
40+
UV_PYTHON_BIN="$(uv python find --no-project "$UV_PYTHON_VERSION")"
41+
echo "uv python binary location: $UV_PYTHON_BIN"
42+
ln -s "$UV_PYTHON_BIN" "/usr/local/bin/python${UV_PYTHON_VERSION}"
43+
ln -s "$UV_PYTHON_BIN" /usr/local/bin/python3
44+
ln -s "$UV_PYTHON_BIN" /usr/local/bin/python
45+
46+
# As a convention, we pin all python packages to a specific version. This
47+
# is to to make sure we can control version upgrades through code changes.
48+
uv pip install --system pip==25.2 cffi==1.16.0
49+
3050
EOF
3151

3252
ENV CC=clang

‎.buildkite/release-automation/forge_x86_64.Dockerfile‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3-labs
22

3-
FROM ubuntu:20.04
3+
FROM ubuntu:22.04
44

55
ENV DEBIAN_FRONTEND=noninteractive
66

@@ -21,17 +21,37 @@ addgroup --gid 992 docker1 # docker group on buildkite AMI as of 2025-06-07
2121
ln -s /usr/bin/clang-12 /usr/bin/clang
2222

2323
# Install miniforge3
24-
curl -sfL https://github.com/conda-forge/miniforge/releases/download/25.3.0-1/Miniforge3-25.3.0-1-Linux-x86_64.sh > /tmp/miniforge3.sh
24+
curl -fsSL https://github.com/conda-forge/miniforge/releases/download/25.3.0-1/Miniforge3-25.3.0-1-Linux-x86_64.sh > /tmp/miniforge3.sh
2525
bash /tmp/miniforge3.sh -b -u -p /usr/local/bin/miniforge3
2626
rm /tmp/miniforge3.sh
2727
/usr/local/bin/miniforge3/bin/conda init bash
2828

2929
# Install Bazelisk
30-
curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 --output /usr/local/bin/bazelisk
30+
curl -fsSL https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 --output /usr/local/bin/bazelisk
3131
chmod +x /usr/local/bin/bazelisk
3232

3333
ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel
3434

35+
# Install uv
36+
curl -fsSL https://astral.sh/uv/install.sh | env UV_UNMANAGED_INSTALL="/usr/local/bin" sh
37+
38+
mkdir -p /usr/local/python
39+
# Install Python using uv
40+
UV_PYTHON_VERSION=3.10
41+
uv python install --install-dir /usr/local/python "$UV_PYTHON_VERSION"
42+
43+
export UV_PYTHON_INSTALL_DIR=/usr/local/python
44+
# Make Python from uv the default by creating symlinks
45+
UV_PYTHON_BIN="$(uv python find --no-project "$UV_PYTHON_VERSION")"
46+
echo "uv python binary location: $UV_PYTHON_BIN"
47+
ln -s "$UV_PYTHON_BIN" "/usr/local/bin/python${UV_PYTHON_VERSION}"
48+
ln -s "$UV_PYTHON_BIN" /usr/local/bin/python3
49+
ln -s "$UV_PYTHON_BIN" /usr/local/bin/python
50+
51+
# As a convention, we pin all python packages to a specific version. This
52+
# is to to make sure we can control version upgrades through code changes.
53+
uv pip install --system pip==25.2 cffi==1.16.0
54+
3555
# A non-root user. Use 2000, which is the same as our buildkite agent VM uses.
3656
adduser --home /home/forge --uid 2000 forge --gid 100
3757
usermod -a -G docker forge

‎.buildkite/release/custom-image-build-and-test-init.sh‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,49 @@ fi
2020
export RAYCI_BUILD_ID="${BUILD_ID}"
2121
echo "RAYCI_BUILD_ID: ${RAYCI_BUILD_ID}"
2222

23-
2423
aws ecr get-login-password --region us-west-2 | \
2524
docker login --username AWS --password-stdin 029272617770.dkr.ecr.us-west-2.amazonaws.com
2625

2726
bash release/gcloud_docker_login.sh release/aws2gce_iam.json
2827
export PATH="${PWD}/google-cloud-sdk/bin:$PATH"
2928

30-
echo "Generate custom build steps"
31-
echo "Downloading Bazel"
29+
30+
echo "--- Install Bazel"
3231
curl -sSfLo /tmp/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64
33-
echo "Making Bazel executable"
3432
chmod +x /tmp/bazel
3533

34+
35+
echo "--- Install uv"
36+
37+
UV_PYTHON_VERSION=3.10
38+
curl -LsSf https://astral.sh/uv/install.sh | sh
39+
UV_BIN="${HOME}/.local/bin/uv"
40+
"${UV_BIN}" python install "${UV_PYTHON_VERSION}"
41+
UV_PYTHON_BIN="$("${UV_BIN}" python find --no-project "${UV_PYTHON_VERSION}")"
42+
43+
44+
echo "--- Generate custom build steps"
45+
3646
if [[ "${AUTOMATIC:-0}" == "1" && "${BUILDKITE_BRANCH}" == "master" ]]; then
3747
export REPORT_TO_RAY_TEST_DB=1
3848
fi
3949

4050
RUN_FLAGS=()
41-
4251
if [[ "${AUTOMATIC:-0}" == "0" || "${BUILDKITE_BRANCH}" == "releases/"* ]]; then
4352
RUN_FLAGS+=(--run-jailed-tests)
4453
fi
4554
if [[ "${BUILDKITE_BRANCH}" != "releases/"* ]]; then
4655
RUN_FLAGS+=(--run-unstable-tests)
4756
fi
4857

49-
echo "---- Build test steps"
50-
/tmp/bazel run //release:custom_image_build_and_test_init\
51-
-- "${RUN_FLAGS[@]}" \
58+
/tmp/bazel build --python_path="${UV_PYTHON_BIN}" \
59+
--build_python_zip --enable_runfiles \
60+
--incompatible_use_python_toolchains=false \
61+
//release:custom_image_build_and_test_init
62+
63+
BUILD_WORKSPACE_DIRECTORY="${PWD}" bazel-bin/release/custom_image_build_and_test_init \
64+
"${RUN_FLAGS[@]}" \
5265
--custom-build-jobs-output-file .buildkite/release/custom_build_jobs.rayci.yaml \
53-
--test-jobs-output-file .buildkite/release/release_tests.json \
66+
--test-jobs-output-file .buildkite/release/release_tests.json
5467

5568
buildkite-agent pipeline upload .buildkite/release/release_tests.json

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ repos:
3030
exclude: |
3131
(?x)^(
3232
# Intentionally bad json schema
33-
python/ray/tests/unit/test_runtime_env_validation_bad_schema.json|
34-
# json5 comments prevent parsing
35-
python/asv.conf.json|
36-
rllib/asv.conf.json
33+
python/ray/tests/unit/test_runtime_env_validation_bad_schema.json
3734
)
3835
- id: check-toml
3936

0 commit comments

Comments
 (0)