Skip to content

Commit 83cdd43

Browse files
authored
Merge branch 'ray-project:master' into master
2 parents 71de052 + b48817c commit 83cdd43

File tree

110 files changed

+9681
-24494
lines changed

Some content is hidden

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

110 files changed

+9681
-24494
lines changed

.buildkite/_images.rayci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ steps:
1313
- "3.12"
1414
env:
1515
PYTHON_VERSION: "{{matrix}}"
16-
REQUIREMENTS_FILE: "python/deplocks/base_deps/ray_base_deps_py{{matrix}}.lock"
1716
ARCH_SUFFIX: ""
1817

1918
- name: raycpubaseextra
@@ -27,7 +26,6 @@ steps:
2726
PYTHON_VERSION: "{{matrix}}"
2827
IMAGE_TYPE: "ray"
2928
ARCH_SUFFIX: ""
30-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix}}.lock"
3129
depends_on: raycpubase
3230

3331
- name: raycudabase
@@ -55,7 +53,6 @@ steps:
5553
env:
5654
PYTHON_VERSION: "{{matrix.python}}"
5755
CUDA_VERSION: "{{matrix.cuda}}"
58-
REQUIREMENTS_FILE: "python/deplocks/base_deps/ray_base_deps_py{{matrix.python}}.lock"
5956
ARCH_SUFFIX: ""
6057

6158
- name: raycudabaseextra
@@ -82,7 +79,6 @@ steps:
8279
CUDA_VERSION: "{{matrix.cuda}}"
8380
IMAGE_TYPE: "ray"
8481
ARCH_SUFFIX: ""
85-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix.python}}.lock"
8682
depends_on: raycudabase
8783

8884
- name: ray-llmbase
@@ -116,7 +112,6 @@ steps:
116112
CUDA_VERSION: "{{matrix.cuda}}"
117113
IMAGE_TYPE: "ray-llm"
118114
ARCH_SUFFIX: ""
119-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix.python}}.lock"
120115
depends_on: ray-llmbase
121116

122117
- name: ray-mlcpubase
@@ -142,7 +137,6 @@ steps:
142137
PYTHON_VERSION: "{{matrix}}"
143138
IMAGE_TYPE: "ray-ml"
144139
ARCH_SUFFIX: ""
145-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix}}.lock"
146140
depends_on: ray-mlcpubase
147141

148142
- name: ray-mlcudabase
@@ -178,7 +172,6 @@ steps:
178172
CUDA_VERSION: "{{matrix.cuda}}"
179173
IMAGE_TYPE: "ray-ml"
180174
ARCH_SUFFIX: ""
181-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix.python}}.lock"
182175
depends_on: ray-mlcudabase
183176

184177
- name: ray-slimcpubase
@@ -195,8 +188,6 @@ steps:
195188
env:
196189
PYTHON_VERSION: "{{matrix}}"
197190
ARCH_SUFFIX: ""
198-
REQUIREMENTS_FILE: "python/deplocks/base_slim/ray_base_slim_py{{matrix}}.lock"
199-
CONSTRAINTS_FILE: "python/requirements_compiled_py{{matrix}}.txt"
200191

201192
- name: ray-slimcudabase
202193
label: "wanda: ray-slim-py{{matrix.python}}-cu{{matrix.cuda}}-base"
@@ -225,5 +216,3 @@ steps:
225216
PYTHON_VERSION: "{{matrix.python}}"
226217
CUDA_VERSION: "{{matrix.cuda}}"
227218
ARCH_SUFFIX: ""
228-
REQUIREMENTS_FILE: "python/deplocks/base_slim/ray_base_slim_py{{matrix.python}}.lock"
229-
CONSTRAINTS_FILE: "python/requirements_compiled_py{{matrix.python}}.txt"

.buildkite/linux_aarch64.rayci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ steps:
4242
env:
4343
PYTHON_VERSION: "{{matrix}}"
4444
ARCH_SUFFIX: "-aarch64"
45-
REQUIREMENTS_FILE: "python/deplocks/base_deps/ray_base_deps_py{{matrix}}.lock"
4645

4746
- name: raycpubaseextra-aarch64
4847
label: "wanda: ray.py{{matrix}}.cpu.base-extra (aarch64)"
@@ -56,7 +55,6 @@ steps:
5655
PYTHON_VERSION: "{{matrix}}"
5756
IMAGE_TYPE: "ray"
5857
ARCH_SUFFIX: "-aarch64"
59-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix}}.lock"
6058
depends_on: raycpubase-aarch64
6159

6260
- name: raycudabase-aarch64
@@ -86,7 +84,6 @@ steps:
8684
PYTHON_VERSION: "{{matrix.python}}"
8785
CUDA_VERSION: "{{matrix.cuda}}"
8886
ARCH_SUFFIX: "-aarch64"
89-
REQUIREMENTS_FILE: "python/deplocks/base_deps/ray_base_deps_py{{matrix.python}}.lock"
9087

9188
- name: raycudabaseextra-aarch64
9289
label: "wanda: ray.py{{matrix.python}}.cu{{matrix.cuda}}.base-extra (aarch64)"
@@ -113,7 +110,6 @@ steps:
113110
CUDA_VERSION: "{{matrix.cuda}}"
114111
IMAGE_TYPE: "ray"
115112
ARCH_SUFFIX: "-aarch64"
116-
REQUIREMENTS_FILE: "python/deplocks/base_extra/ray_base_extra_py{{matrix.python}}.lock"
117113
depends_on: raycudabase-aarch64
118114

119115
# NOTE(andrew-anyscale): dashboard is architecture agnostic, but wanda pulls

.buildkite/release/build.rayci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ steps:
1010
env:
1111
PYTHON_VERSION: "{{matrix}}"
1212
IMAGE_TYPE: "ray"
13-
REQUIREMENTS_FILE: "python/deplocks/base_extra_testdeps/ray_base_extra_testdeps_py{{matrix}}.lock"
1413
depends_on:
1514
- raycpubaseextra
1615

@@ -29,7 +28,6 @@ steps:
2928
PYTHON_VERSION: "{{matrix.python}}"
3029
CUDA_VERSION: "{{matrix.cuda}}"
3130
IMAGE_TYPE: "ray"
32-
REQUIREMENTS_FILE: "python/deplocks/base_extra_testdeps/ray_base_extra_testdeps_cuda_py{{matrix.python}}.lock"
3331
depends_on:
3432
- raycudabaseextra
3533

@@ -46,7 +44,6 @@ steps:
4644
PYTHON_VERSION: "{{matrix.python}}"
4745
CUDA_VERSION: "{{matrix.cuda}}"
4846
IMAGE_TYPE: "ray-llm"
49-
REQUIREMENTS_FILE: "release/ray_release/byod/requirements_llm_byod_{{matrix.python}}.txt"
5047
depends_on:
5148
- ray-llmbaseextra
5249

@@ -63,7 +60,6 @@ steps:
6360
PYTHON_VERSION: "{{matrix.python}}"
6461
CUDA_VERSION: "{{matrix.cuda}}"
6562
IMAGE_TYPE: "ray-ml"
66-
REQUIREMENTS_FILE: "python/deplocks/base_extra_testdeps/ray_ml_base_extra_testdeps_cuda_py{{matrix.python}}.lock"
6763
depends_on:
6864
- ray-mlcudabaseextra
6965

.vale/styles/config/vocabularies/Data/accept.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ Predibase('s)?
3030
[Pp]refetch
3131
[Pp]refetching
3232
[Pp]ostprocess
33+
[Pp]ostprocessor(s)?
3334
[Pp]reprocess
3435
[Pp]reprocessor(s)?
3536
process_file
3637
[Pp]ushdown
38+
[Rr]eformat(s)?
3739
queryable
3840
RGB
3941
[Rr]un[Aa][Ii]

build-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ RAY_DEPS_BUILD_DIR="$(mktemp -d)"
6464
cp docker/base-deps/Dockerfile "${RAY_DEPS_BUILD_DIR}/."
6565
mkdir -p "${RAY_DEPS_BUILD_DIR}/python"
6666
cp python/requirements_compiled.txt "${RAY_DEPS_BUILD_DIR}/python/requirements_compiled.txt"
67+
cp python/requirements_compiled_py${PYTHON_VERSION}.txt "${RAY_DEPS_BUILD_DIR}/python/requirements_compiled_py${PYTHON_VERSION}.txt"
6768
PYTHON_DEPSET_FILE_NAME="ray_base_deps_py${PYTHON_VERSION}.lock"
6869
REQUIREMENTS_FILE_BASE_DEPS="python/deplocks/base_deps/${PYTHON_DEPSET_FILE_NAME}"
6970

ci/build/build-manylinux-forge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [[ "${RAYCI_DISABLE_JAVA:-false}" != "true" && "${RAY_INSTALL_JAVA:-1}" == "1
4444
fi
4545

4646
# Install nodejs
47-
NODE_VERSION_FULL="${NODE_VERSION_FULL:-14.21.3}"
47+
NODE_VERSION_FULL="14.21.3"
4848

4949
if [[ "${ARCH}" == "x86_64" ]]; then
5050
NODE_URL="https://nodejs.org/dist/v${NODE_VERSION_FULL}/node-v${NODE_VERSION_FULL}-linux-x64.tar.xz"

ci/env/install-dependencies.sh

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -153,30 +153,46 @@ install_node() {
153153
return
154154
fi
155155

156-
if [[ -n "${BUILDKITE-}" ]] ; then
157-
if [[ "${OSTYPE}" = darwin* ]]; then
158-
if [[ "$(uname -m)" == "arm64" ]]; then
159-
curl -sSfL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
160-
else
161-
curl -sSfL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
162-
fi
163-
else
164-
# https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
165-
curl -sSfL https://deb.nodesource.com/setup_14.x | sudo -E bash -
166-
sudo apt-get install -y nodejs
167-
return
168-
fi
156+
if [[ "${BUILDKITE-}" == "" ]] ; then
157+
echo "Skipping install_node in non-Buildkite environment is not supported" > /dev/stderr
158+
return
169159
fi
170160

171-
# Install the latest version of Node.js in order to build the dashboard.
172-
(
173-
set +x # suppress set -x since it'll get very noisy here.
174-
. "${HOME}/.nvm/nvm.sh"
175-
NODE_VERSION="14"
176-
nvm install $NODE_VERSION
177-
nvm use --silent $NODE_VERSION
178-
npm config set loglevel warn # make NPM quieter
179-
)
161+
if [[ "${OSTYPE}" = darwin* ]]; then
162+
curl -sSfL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
163+
164+
(
165+
set +x # suppress set -x since it'll get very noisy here.
166+
. "${HOME}/.nvm/nvm.sh"
167+
NODE_VERSION="14"
168+
nvm install $NODE_VERSION
169+
nvm use --silent $NODE_VERSION
170+
npm config set loglevel warn # make NPM quieter
171+
)
172+
else
173+
# Linux
174+
175+
NODE_VERSION_FULL="14.21.3"
176+
177+
if [[ "$(uname -m)" == "x86_64" ]]; then
178+
NODE_URL="https://nodejs.org/dist/v${NODE_VERSION_FULL}/node-v${NODE_VERSION_FULL}-linux-x64.tar.xz"
179+
NODE_SHA256="05c08a107c50572ab39ce9e8663a2a2d696b5d262d5bd6f98d84b997ce932d9a"
180+
else # aarch64
181+
NODE_URL="https://nodejs.org/dist/v${NODE_VERSION_FULL}/node-v${NODE_VERSION_FULL}-linux-arm64.tar.xz"
182+
NODE_SHA256="f06642bfcf0b8cc50231624629bec58b183954641b638e38ed6f94cd39e8a6ef"
183+
fi
184+
185+
NODE_DIR="/usr/local/node"
186+
curl -fsSL "${NODE_URL}" -o /tmp/node.tar.xz
187+
echo "$NODE_SHA256 /tmp/node.tar.xz" | sha256sum -c -
188+
sudo mkdir -p "$NODE_DIR"
189+
sudo tar -xf /tmp/node.tar.xz -C "$NODE_DIR" --strip-components=1
190+
rm /tmp/node.tar.xz
191+
sudo ln -sf /usr/local/node/bin/node /usr/local/bin/node
192+
sudo ln -sf /usr/local/node/bin/npm /usr/local/bin/npm
193+
sudo ln -sf /usr/local/node/bin/npx /usr/local/bin/npx
194+
195+
fi
180196
}
181197

182198
install_toolchains() {

ci/raydepsets/configs/rayimg.depsets.yaml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ depsets:
4343
- /tmp/ray-deps/requirements_compiled_py${PYTHON_VERSION}.txt
4444
depsets:
4545
- ray_img_depset_${PYTHON_SHORT}
46-
output: python/deplocks/base_extra_testdeps/ray_base_extra_testdeps_py${PYTHON_VERSION}.lock
46+
output: python/deplocks/base_extra_testdeps/ray-base_extra_testdeps_py${PYTHON_VERSION}.lock
4747
append_flags:
4848
- --unsafe-package ray
4949
- --python-version=${PYTHON_VERSION}
@@ -54,27 +54,21 @@ depsets:
5454
- py312
5555
- py313
5656

57-
- name: ray_base_extra_testdeps_cuda_${PYTHON_SHORT}
57+
- name: ray_base_extra_testdeps_llm_cuda_${PYTHON_SHORT}
5858
operation: expand
5959
requirements:
60-
- release/ray_release/byod/requirements_byod_${PYTHON_VERSION}.in
60+
- release/ray_release/byod/requirements_llm_byod_${PYTHON_VERSION}.txt
6161
- docker/base-deps/requirements.in
6262
- docker/base-extra/requirements.in
63-
constraints:
64-
- /tmp/ray-deps/requirements_compiled_py${PYTHON_VERSION}.txt
6563
depsets:
6664
- ray_img_depset_${PYTHON_SHORT}
67-
output: python/deplocks/base_extra_testdeps/ray_base_extra_testdeps_cuda_py${PYTHON_VERSION}.lock
65+
output: python/deplocks/base_extra_testdeps/ray-llm-base_extra_testdeps_py${PYTHON_VERSION}.lock
6866
append_flags:
69-
- --extra-index-url https://download.pytorch.org/whl/cu128
7067
- --unsafe-package ray
7168
- --python-version=${PYTHON_VERSION}
7269
- --python-platform=linux
7370
build_arg_sets:
74-
- py310
7571
- py311
76-
- py312
77-
- py313
7872

7973
- name: ray_base_extra_testdeps_gpu_${PYTHON_SHORT}
8074
operation: expand
@@ -86,7 +80,7 @@ depsets:
8680
- /tmp/ray-deps/requirements_compiled_py${PYTHON_VERSION}.txt
8781
depsets:
8882
- ray_img_depset_${PYTHON_SHORT}
89-
output: python/deplocks/base_extra_testdeps/ray_base_extra_testdeps_gpu_py${PYTHON_VERSION}.lock
83+
output: python/deplocks/base_extra_testdeps/ray-gpu-base_extra_testdeps_py${PYTHON_VERSION}.lock
9084
append_flags:
9185
- --extra-index-url https://download.pytorch.org/whl/cu128
9286
- --unsafe-package ray
@@ -95,24 +89,6 @@ depsets:
9589
build_arg_sets:
9690
- py310
9791

98-
- name: ray_ml_base_extra_testdeps_${PYTHON_SHORT}
99-
operation: expand
100-
requirements:
101-
- release/ray_release/byod/requirements_ml_byod_${PYTHON_VERSION}.in
102-
- docker/base-deps/requirements.in
103-
- docker/base-extra/requirements.in
104-
constraints:
105-
- /tmp/ray-deps/requirements_compiled_py${PYTHON_VERSION}.txt
106-
depsets:
107-
- ray_img_depset_${PYTHON_SHORT}
108-
output: python/deplocks/base_extra_testdeps/ray_ml_base_extra_testdeps_py${PYTHON_VERSION}.lock
109-
append_flags:
110-
- --unsafe-package ray
111-
- --python-version=${PYTHON_VERSION}
112-
- --python-platform=linux
113-
build_arg_sets:
114-
- py310
115-
11692
- name: ray_ml_base_extra_testdeps_cuda_${PYTHON_SHORT}
11793
operation: expand
11894
requirements:
@@ -123,7 +99,7 @@ depsets:
12399
- /tmp/ray-deps/requirements_compiled_py${PYTHON_VERSION}.txt
124100
depsets:
125101
- ray_img_depset_${PYTHON_SHORT}
126-
output: python/deplocks/base_extra_testdeps/ray_ml_base_extra_testdeps_cuda_py${PYTHON_VERSION}.lock
102+
output: python/deplocks/base_extra_testdeps/ray-ml-base_extra_testdeps_py${PYTHON_VERSION}.lock
127103
append_flags:
128104
- --extra-index-url https://download.pytorch.org/whl/cu128
129105
- --unsafe-package ray

doc/source/data/examples.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,19 @@ examples:
2424
use_cases:
2525
- computer vision
2626
link: examples/huggingface_vit_batch_prediction
27-
- title: Batch Inference with LoRA Adapter
27+
- title: Tabular Data Training and Batch Inference with XGBoost
28+
skill_level: beginner
29+
frameworks:
30+
- xgboost
31+
link: ../train/examples/xgboost/distributed-xgboost-lightgbm
32+
- title: LLM Batch Inference
2833
skill_level: beginner
2934
frameworks:
3035
- vLLM
3136
use_cases:
3237
- large language models
3338
- generative ai
34-
link: ../llm/examples/batch/vllm-with-lora
39+
link: examples/llm_batch_inference_text/content/README
3540
- title: Batch Inference with Structural Output
3641
skill_level: beginner
3742
frameworks:
@@ -40,11 +45,23 @@ examples:
4045
- large language models
4146
- generative ai
4247
link: ../llm/examples/batch/vllm-with-structural-output
43-
- title: Tabular Data Training and Batch Inference with XGBoost
48+
- title: Batch Inference with LoRA Adapter
4449
skill_level: beginner
4550
frameworks:
46-
- xgboost
47-
link: ../train/examples/xgboost/distributed-xgboost-lightgbm
51+
- vLLM
52+
use_cases:
53+
- large language models
54+
- generative ai
55+
link: ../llm/examples/batch/vllm-with-lora
56+
- title: Multimodal LLM Batch Inference
57+
skill_level: beginner
58+
frameworks:
59+
- vLLM
60+
use_cases:
61+
- large language models
62+
- generative ai
63+
- computer vision
64+
link: examples/llm_batch_inference_vision/content/README
4865
- title: Unstructured Data Ingestion and Processing
4966
skill_level: intermediate
5067
frameworks:
@@ -53,4 +70,4 @@ examples:
5370
use_cases:
5471
- document processing
5572
- data ingestion
56-
link: examples/unstructured_data_ingestion/content/unstructured_data_ingestion
73+
link: examples/unstructured_data_ingestion/content/unstructured_data_ingestion

doc/source/data/examples/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ filegroup(
2525
"**/ci/gce.yaml"
2626
]),
2727
visibility = ["//doc:__pkg__"],
28-
)
28+
)

0 commit comments

Comments
 (0)