Skip to content

Commit fe7bd59

Browse files
authored
Merge branch 'master' into autoscaler-ippr
2 parents 388ba37 + 5f83c07 commit fe7bd59

File tree

110 files changed

+2431
-812
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

+2431
-812
lines changed

.buildkite/dependencies.rayci.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
group: dependencies
2+
depends_on:
3+
- forge
4+
steps:
5+
# dependencies
6+
- label: ":tapioca: build: pip-compile dependencies"
7+
key: pip_compile_dependencies
8+
tags: always
9+
instance_type: small
10+
commands:
11+
# uncomment the following line to update the pinned versions of pip dependencies
12+
# to the latest versions; otherwise, the pinned versions will be re-used as much
13+
# as possible
14+
# - rm ./python/requirements_compiled.txt
15+
- cp ./python/requirements_compiled.txt requirements_compiled_backup.txt
16+
- ./ci/ci.sh compile_pip_dependencies
17+
- cp -f ./python/requirements_compiled.txt /artifact-mount/
18+
- diff ./python/requirements_compiled.txt requirements_compiled_backup.txt || (echo "requirements_compiled.txt is not up to date. Please download it from Artifacts tab and git push the changes." && exit 1)
19+
job_env: oss-ci-base_test-py3.11
20+
depends_on: oss-ci-base_test-multipy
21+
22+
- label: ":tapioca: build: raydepsets: compile LLM dependencies"
23+
key: raydepsets_compile_llm_dependencies
24+
tags: always
25+
instance_type: small
26+
command: ./ci/test_compile_llm_requirements.sh
27+
job_env: oss-ci-base_test-py3.11
28+
depends_on: oss-ci-base_test-multipy

.buildkite/others.rayci.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,6 @@ group: others
22
depends_on:
33
- forge
44
steps:
5-
# dependencies
6-
- label: ":tapioca: build: pip-compile dependencies"
7-
key: pip_compile_dependencies
8-
tags: always
9-
instance_type: small
10-
commands:
11-
# uncomment the following line to update the pinned versions of pip dependencies
12-
# to the latest versions; otherwise, the pinned versions will be re-used as much
13-
# as possible
14-
# - rm ./python/requirements_compiled.txt
15-
- cp ./python/requirements_compiled.txt requirements_compiled_backup.txt
16-
- ./ci/ci.sh compile_pip_dependencies
17-
- cp -f ./python/requirements_compiled.txt /artifact-mount/
18-
- diff ./python/requirements_compiled.txt requirements_compiled_backup.txt || (echo "requirements_compiled.txt is not up to date. Please download it from Artifacts tab and git push the changes." && exit 1)
19-
job_env: oss-ci-base_test-py3.11
20-
depends_on: oss-ci-base_test-multipy
21-
22-
- label: ":tapioca: build: uv pip compile LLM dependencies"
23-
key: uv_pip_compile_llm_dependencies
24-
tags: always
25-
instance_type: small
26-
command: ./ci/test_compile_llm_requirements.sh
27-
job_env: oss-ci-base_test-py3.11
28-
depends_on: oss-ci-base_test-multipy
29-
305
# docs
316
- name: doctestbuild
327
wanda: ci/docker/doctest.build.wanda.yaml

BUILD.bazel

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,8 @@ alias(
116116
# https://github.com/hedronvision/bazel-compile-commands-extractor?tab=readme-ov-file#vscode - directions for clangd config
117117
refresh_compile_commands(
118118
name = "refresh_compile_commands",
119-
exclude_external_sources = True, # removed below to have lsp index external cc files at the cost of 2x index time
120-
# Specify the targets of interest.
121-
# For example, specify a dict of targets and any flags required to build.
122119
targets = {
123-
"//:ray_pkg_zip": "",
124-
},
125-
# No need to add flags already in .bazelrc. They're automatically picked up.
126-
)
127-
128-
# bazel run :refresh_compile_commands_external_sources for generation with external source files (cc files)
129-
refresh_compile_commands(
130-
name = "refresh_compile_commands_external_sources",
131-
targets = {
132-
"//:ray_pkg_zip": "",
120+
"//:ray_pkg": "",
133121
},
134122
)
135123

@@ -515,6 +503,18 @@ genrule(
515503
local = 1,
516504
)
517505

506+
py_binary(
507+
name = "gen_py_proto",
508+
srcs = ["gen_py_proto.py"],
509+
data = [
510+
":ray_py_proto_zip",
511+
],
512+
visibility = ["//visibility:private"],
513+
deps = [
514+
"//bazel:gen_extract",
515+
],
516+
)
517+
518518
py_binary(
519519
name = "gen_ray_pkg",
520520
srcs = ["gen_ray_pkg.py"],

bazel/gen_extract.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ def gen_extract(
1616

1717
root_dir = os.environ.get("BUILD_WORKSPACE_DIRECTORY")
1818
if not root_dir:
19-
raise ValueError("BUILD_WORKSPACE_DIRECTORY not set")
19+
raise ValueError(
20+
"BUILD_WORKSPACE_DIRECTORY not set; please run this script from 'bazelisk run'"
21+
)
2022

2123
if sub_dir:
2224
extract_dir = os.path.join(root_dir, sub_dir)

ci/lint/pydoclint-baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ python/ray/actor.py
307307
DOC201: Method `ActorMethod.options` does not have a return section in docstring
308308
DOC101: Method `_ActorClassMetadata.__init__`: Docstring contains fewer arguments than in function signature.
309309
DOC107: Method `_ActorClassMetadata.__init__`: The option `--arg-type-hints-in-signature` is `True` but not all args in the signature have type hints
310-
DOC103: Method `_ActorClassMetadata.__init__`: Docstring arguments are different from function arguments. (Or could be other formatting issues: https://jsh9.github.io/pydoclint/violation_codes.html#notes-on-doc103 ). Arguments in the function signature but not in the docstring: [accelerator_type: , actor_creation_function_descriptor: , class_id: , concurrency_groups: , enable_tensor_transport: bool, label_selector: , language: , max_restarts: , max_task_retries: , memory: , modified_class: , num_cpus: , num_gpus: , object_store_memory: , resources: , runtime_env: , scheduling_strategy: SchedulingStrategyT].
310+
DOC103: Method `_ActorClassMetadata.__init__`: Docstring arguments are different from function arguments. (Or could be other formatting issues: https://jsh9.github.io/pydoclint/violation_codes.html#notes-on-doc103 ). Arguments in the function signature but not in the docstring: [accelerator_type: , actor_creation_function_descriptor: , class_id: , concurrency_groups: , enable_tensor_transport: bool, label_selector: , language: , max_restarts: , max_task_retries: , memory: , method_meta: , modified_class: , num_cpus: , num_gpus: , object_store_memory: , resources: , runtime_env: , scheduling_strategy: SchedulingStrategyT].
311311
DOC101: Method `ActorClass.__init__`: Docstring contains fewer arguments than in function signature.
312312
DOC106: Method `ActorClass.__init__`: The option `--arg-type-hints-in-signature` is `True` but there are no argument type hints in the signature
313313
DOC107: Method `ActorClass.__init__`: The option `--arg-type-hints-in-signature` is `True` but not all args in the signature have type hints

ci/pipeline/determine_tests_to_run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
lint python cpp core_cpp java workflow compiled_graphs dashboard ray_client
1515
data dask serve ml tune train llm rllib rllib_gpu rllib_directly
1616
linux_wheels macos_wheels docker doc python_dependencies tools
17-
release_tests compiled_python spark_on_ray
17+
release_tests compiled_python spark_on_ray runtime_env_container
1818
""".split()
1919
)
2020

cpp/src/ray/runtime/runtime_env.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <ray/api/runtime_env.h>
1717
#include <ray/util/logging.h>
1818

19-
#include "src/ray/protobuf/runtime_env_common.pb.h"
19+
#include "src/ray/protobuf/public/runtime_environment.pb.h"
2020

2121
namespace ray {
2222

doc/source/data/images/dataset-shuffle.svg

Lines changed: 1 addition & 1 deletion
Loading

doc/source/ray-overview/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ We publish the dependencies that are installed in our ``ray`` Docker images for
436436
.. tab-item:: ray (Python 3.9)
437437
:sync: ray (Python 3.9)
438438

439-
Ray version: nightly (`f99d0ea <https://github.com/ray-project/ray/commit/f99d0ea7c4248f8d64eeb8f914d2742c91cd1948>`_)
439+
Ray version: nightly (`ec5d410 <https://github.com/ray-project/ray/commit/ec5d4108737ead7dccb2930439842e0b2de012bb>`_)
440440

441441
.. literalinclude:: ./pip_freeze_ray-py39-cpu.txt
442442

doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ aiohappyeyeballs==2.6.1
1212
aiohttp==3.11.16
1313
aiohttp-cors==0.7.0
1414
aioitertools==0.11.0
15-
aiorwlock==1.5.0
15+
aiorwlock==1.3.0
1616
aiosignal==1.3.1
1717
aiosqlite==0.19.0
1818
ale-py==0.10.1
1919
alembic==1.12.1
20+
amqp==5.3.1
2021
annotated-types==0.6.0
2122
antlr4-python3-runtime==4.11.1
2223
anyio==3.7.1
@@ -32,11 +33,15 @@ astunparse==1.6.3
3233
async-timeout==4.0.3
3334
attrs==25.1.0
3435
ax-platform==0.3.2
36+
azure-common==1.1.28
37+
azure-core==1.29.5
38+
azure-storage-blob==12.22.0
3539
Babel==2.13.1
3640
backcall==0.2.0
3741
base58==2.0.1
3842
bayesian-optimization==1.4.3
3943
beautifulsoup4==4.11.1
44+
billiard==4.2.1
4045
bleach==6.1.0
4146
bokeh==2.4.3
4247
boltons @ file:///home/conda/feedstock_root/build_artifacts/boltons_1733827268945/work
@@ -45,12 +50,15 @@ boto3==1.26.76
4550
botocore==1.29.76
4651
botorch==0.8.5
4752
Brotli @ file:///home/conda/feedstock_root/build_artifacts/brotli-split_1749229842835/work
48-
build==1.2.2.post1
4953
cachetools==5.5.2
54+
celery==5.5.3
5055
certifi==2025.1.31
5156
cffi==1.16.0
5257
charset-normalizer==3.3.2
5358
click==8.1.7
59+
click-didyoumean==0.3.1
60+
click-plugins==1.1.1.2
61+
click-repl==0.3.0
5462
cloudpickle==2.2.0
5563
cma==3.2.2
5664
cmdstanpy==1.2.0
@@ -60,7 +68,7 @@ colorful==0.5.5
6068
colorlog==6.7.0
6169
comet-ml==3.44.1
6270
comm==0.2.0
63-
conda @ file:///home/conda/feedstock_root/build_artifacts/conda_1749201703459/work/conda-src
71+
conda @ file:///home/conda/feedstock_root/build_artifacts/conda_1754405245494/work/conda-src
6472
conda-libmamba-solver @ file:///home/conda/feedstock_root/build_artifacts/conda-libmamba-solver_1745834476052/work/src
6573
conda-package-handling @ file:///home/conda/feedstock_root/build_artifacts/conda-package-handling_1736345463896/work
6674
conda_package_streaming @ file:///home/conda/feedstock_root/build_artifacts/conda-package-streaming_1729004031731/work
@@ -121,28 +129,32 @@ gast==0.6.0
121129
gcs-oauth2-boto-plugin==3.0
122130
getdaft==0.4.3
123131
gitdb==4.0.11
124-
GitPython==3.1.40
132+
GitPython==3.1.44
125133
glfw==2.6.3
126134
google-api-core==2.24.2
127135
google-api-python-client==2.111.0
128136
google-apitools==0.5.32
129137
google-auth==2.23.4
130138
google-auth-httplib2==0.1.1
131139
google-auth-oauthlib==1.0.0
140+
google-cloud-core==2.4.1
141+
google-cloud-storage==2.14.0
142+
google-crc32c==1.5.0
132143
google-oauth==1.0.1
133144
google-pasta==0.2.0
134145
google-reauth==0.1.1
146+
google-resumable-media==2.6.0
135147
googleapis-common-protos==1.61.0
136148
GPy==1.13.1
137149
gpytorch==1.10
138150
graphene==3.4.3
139151
graphql-core==3.2.3
140152
graphql-relay==3.2.0
141153
greenlet==3.0.1
142-
grpcio==1.66.2
154+
grpcio==1.74.0
143155
gsutil==5.27
144156
gunicorn==20.1.0
145-
gymnasium==1.0.0
157+
gymnasium==1.1.1
146158
h11==0.16.0
147159
h2 @ file:///home/conda/feedstock_root/build_artifacts/h2_1733298745555/work
148160
h5py==3.10.0
@@ -166,6 +178,7 @@ ipykernel==6.27.1
166178
ipython==8.12.3
167179
ipython-genutils==0.2.0
168180
ipywidgets==8.1.3
181+
isodate==0.6.1
169182
isoduration==20.11.0
170183
itsdangerous==2.1.2
171184
jedi==0.19.1
@@ -190,14 +203,14 @@ jupyterlab_server==2.24.0
190203
jupyterlab_widgets==3.0.11
191204
keras==2.15.0
192205
kiwisolver==1.4.5
206+
kombu==5.5.4
193207
labmaze==1.0.6
194208
lazy_loader==0.4
195209
libclang==18.1.1
196-
libmambapy @ file:///home/conda/feedstock_root/build_artifacts/bld/rattler-build_libmambapy_1750078835/work/libmambapy
210+
libmambapy @ file:///home/conda/feedstock_root/build_artifacts/bld/rattler-build_libmambapy_1753776969/work/libmambapy
197211
lightgbm==4.6.0
198212
lightning-utilities==0.11.2
199213
linear-operator==0.4.0
200-
linkify-it-py==2.0.3
201214
llvmlite==0.42.0
202215
locket==1.0.0
203216
lxml==4.9.4
@@ -208,10 +221,9 @@ markdown-it-py==2.2.0
208221
MarkupSafe==2.1.3
209222
matplotlib==3.7.4
210223
matplotlib-inline==0.1.6
211-
mdit-py-plugins==0.4.2
212224
mdurl==0.1.2
213225
memray==1.10.0
214-
menuinst @ file:///home/conda/feedstock_root/build_artifacts/menuinst_1750792275478/work
226+
menuinst @ file:///home/conda/feedstock_root/build_artifacts/menuinst_1753546271769/work
215227
minigrid==2.3.1
216228
mistune==0.8.4
217229
ml-dtypes==0.3.2
@@ -240,6 +252,7 @@ netifaces==0.11.0
240252
networkx==3.2.1
241253
nevergrad==0.4.3.post7
242254
ninja==1.11.1.1
255+
nixl==0.4.0
243256
notebook==6.5.7
244257
notebook_shim==0.2.3
245258
numba==0.59.1
@@ -284,7 +297,6 @@ pettingzoo==1.24.3
284297
pexpect==4.8.0
285298
pickleshare==0.7.5
286299
pillow==10.3.0
287-
pip-tools==7.4.1
288300
platformdirs==3.11.0
289301
plotly==5.23.0
290302
pluggy==1.3.0
@@ -316,7 +328,6 @@ pynvml==11.5.0
316328
PyOpenGL==3.1.7
317329
pyOpenSSL==25.0.0
318330
pyparsing==3.1.1
319-
pyproject_hooks==1.2.0
320331
pyro-api==0.1.2
321332
pyro-ppl==1.9.1
322333
Pyro4==4.82
@@ -334,11 +345,10 @@ pyu2f==0.1.5
334345
PyYAML==6.0.1
335346
pyzmq==26.0.3
336347
qpd==0.4.4
337-
ray @ file:///home/ray/ray-3.0.0.dev0-cp39-cp39-manylinux2014_x86_64.whl#sha256=5a7ca35580e97891618705a7a7efcc556b30cc1d3e6155605d690b18d50c4383
338-
redis==4.4.2
348+
ray @ file:///home/ray/ray-3.0.0.dev0-cp39-cp39-manylinux2014_x86_64.whl#sha256=6dd296fe192d3c9953867ef02ab2645e2f5e48f49e7d4e7c1fecc7689d139cf1
339349
referencing==0.36.2
340350
regex==2024.5.15
341-
requests==2.32.3
351+
requests @ file:///home/conda/feedstock_root/build_artifacts/requests_1733217035951/work
342352
requests-oauthlib==2.0.0
343353
requests-toolbelt==1.0.0
344354
responses==0.13.4
@@ -396,9 +406,8 @@ tensorflow-metadata==1.13.1
396406
tensorflow-probability==0.23.0
397407
termcolor==2.4.0
398408
terminado==0.18.1
399-
textual==4.0.0
400409
threadpoolctl==3.1.0
401-
tifffile==2024.8.30
410+
tifffile==2024.7.21
402411
timm==0.9.2
403412
tinycss2==1.3.0
404413
tinyscaler==1.2.8
@@ -423,18 +432,17 @@ transformers==4.36.2
423432
triad==0.9.8
424433
triton==2.3.0
425434
typeguard==2.13.3
426-
typer==0.16.0
435+
typer==0.12.3
427436
types-python-dateutil==2.9.0.20240316
428-
typing-inspection==0.4.1
429437
typing_extensions==4.12.2
430438
tzdata==2025.2
431-
uc-micro-py==1.0.3
432439
uri-template==1.3.0
433440
uritemplate==4.1.1
434441
urllib3==1.26.19
435442
utilsforecast==0.2.0
436443
uvicorn==0.22.0
437444
uvloop==0.21.0
445+
vine==5.1.0
438446
virtualenv==20.29.1
439447
wandb==0.17.0
440448
watchfiles==0.19.0

0 commit comments

Comments
 (0)