Skip to content

Commit

Permalink
Merge branch 'master' into py313
Browse files Browse the repository at this point in the history
  • Loading branch information
srinathk10 authored Feb 3, 2025
2 parents 806d4e1 + 406963a commit 401ade4
Show file tree
Hide file tree
Showing 541 changed files with 10,629 additions and 9,273 deletions.
1 change: 1 addition & 0 deletions .buildkite/_forge.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ steps:
- "12.1.1-cudnn8"
- "12.3.2-cudnn9"
- "12.4.1-cudnn"
- "12.5.1-cudnn"
env:
PYTHON_VERSION: "{{matrix.python}}"
CUDA_VERSION: "{{matrix.cuda}}"
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/build.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ steps:
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version {{matrix}}
--platform cu11.7.1-cudnn8 --platform cu11.8.0-cudnn8
--platform cu12.1.1-cudnn8 --platform cu12.3.2-cudnn9
--platform cu12.4.1-cudnn --platform cpu
--platform cu12.4.1-cudnn --platform cu12.5.1-cudnn
--platform cpu
--image-type ray --upload
depends_on:
- manylinux
Expand Down
4 changes: 3 additions & 1 deletion .buildkite/linux_aarch64.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ steps:
- "12.1.1-cudnn8"
- "12.3.2-cudnn9"
- "12.4.1-cudnn"
- "12.5.1-cudnn"
instance_type: builder-arm64
env:
PYTHON_VERSION: "{{matrix.python}}"
Expand Down Expand Up @@ -82,7 +83,8 @@ steps:
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version {{matrix}}
--platform cu11.7.1-cudnn8 --platform cu11.8.0-cudnn8
--platform cu12.1.1-cudnn8 --platform cu12.3.2-cudnn9
--platform cu12.4.1-cudnn --platform cpu
--platform cu12.4.1-cudnn --platform cu12.5.1-cudnn
--platform cpu
--image-type ray --architecture aarch64 --upload
depends_on:
- manylinux-aarch64
Expand Down
17 changes: 17 additions & 0 deletions .buildkite/llm.rayci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
group: llm tests
depends_on:
- forge
- oss-ci-base_ml
steps:
- name: llmbuild
wanda: ci/docker/llm.build.wanda.yaml

- label: "llm tests"
key: "llm-tests"
tags:
- python
- llm
instance_type: medium
commands:
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/llm/... llm
depends_on: llmbuild
3 changes: 3 additions & 0 deletions .buildkite/rllib.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ steps:
tags:
- rllib_gpu
- gpu
- skip-on-microcheck
parallelism: 5
instance_type: gpu
commands:
Expand Down Expand Up @@ -137,6 +138,7 @@ steps:
tags:
- rllib_directly
- doc
- skip-on-microcheck
instance_type: medium
commands:
# doc tests
Expand All @@ -159,6 +161,7 @@ steps:
tags:
- rllib_gpu
- gpu
- skip-on-microcheck
parallelism: 5
instance_type: gpu-large
commands:
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
/python/ray/train/ @hongpeng-guo @justinvyu @matthewdeng @raulchen @woshiyyya
/doc/source/train/ @hongpeng-guo @justinvyu @matthewdeng @raulchen @woshiyyya @ray-project/ray-docs

# LLM
/python/ray/llm/ @ray-project/ray-llm

# Serve (docs)
/doc/source/serve/ @edoakes @zcin @GeneDer @akshay-anyscale @ray-project/ray-docs

Expand Down
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ exclude: |
python/ray/core/generated/|
python/ray/serve/generated/|
python/ray/cloudpickle/|
python/ray/dashboard/client/public/|
python/ray/tests/test_cli_patterns|
python/ray/_private/runtime_env/_clonevirtualenv.py|
doc/external/|
doc/source/
Expand Down
2 changes: 1 addition & 1 deletion .rayciversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.10.0
4 changes: 4 additions & 0 deletions .vale/styles/config/vocabularies/RLlib/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,26 @@
[Aa]lgos?
(APPO|appo)
[Aa]utoscal(e|ing)
[Aa]utoregressive
boolean
[Cc]allables?
[Cc]heckpoints?(ing)?
[Cc]heckpointable
classmethods?
CNNs?
coeff
config
(DQN|dqn)
[Ee]nvs?
(IMPALA|impala)
logits?
log-probs?
LSTMs?
hyperparameters?
MARLModule
(MARWIL|marwil)
MLAgents
MLPs?
multiagent
[Pp]erceptrons?
postprocessing
Expand Down
2 changes: 1 addition & 1 deletion .vale/styles/config/vocabularies/Train/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ LightGBM
PyTorch
PyTorch Lightning
TensorFlow
XGBoost
XGBoost
11 changes: 10 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ ray_cc_library(
"//src/ray/protobuf:common_cc_proto",
"//src/ray/util",
"//src/ray/util:compat",
"//src/ray/util:counter_map",
"@msgpack",
],
)
Expand Down Expand Up @@ -537,7 +538,10 @@ ray_cc_library(
":scheduler",
":worker_rpc",
"//src/ray/protobuf:agent_manager_cc_proto",
"//src/ray/util:counter_map",
"//src/ray/util:thread_checker",
"//src/ray/util:throttler",
"//src/ray/util:type_traits",
"@boost//:bimap",
"@com_github_grpc_grpc//src/proto/grpc/health/v1:health_proto",
"@com_google_absl//absl/container:btree",
Expand Down Expand Up @@ -718,6 +722,7 @@ ray_cc_library(
"//src/ray/protobuf:common_cc_proto",
"//src/ray/protobuf:runtime_env_agent_cc_proto",
"//src/ray/util",
"//src/ray/util:throttler",
"@boost//:asio",
"@boost//:beast",
"@boost//:system",
Expand Down Expand Up @@ -1972,6 +1977,7 @@ ray_cc_library(
":pubsub_lib",
":ray_common",
":redis_store_client",
"//src/ray/util:sequencer",
"//src/ray/protobuf:usage_cc_proto",
],
)
Expand Down Expand Up @@ -2209,6 +2215,7 @@ ray_cc_library(
":ray_common",
":stats_lib",
"//src/ray/util",
"//src/ray/util:exponential_backoff",
"@boost//:asio",
],
)
Expand All @@ -2224,7 +2231,7 @@ ray_cc_library(
"src/ray/gcs/store_client/store_client.h",
],
deps = [
"redis_client",
":redis_client",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/synchronization",
],
Expand Down Expand Up @@ -2370,6 +2377,7 @@ ray_cc_library(
"//src/ray/protobuf:gcs_cc_proto",
"//src/ray/protobuf:gcs_service_cc_proto",
"//src/ray/util",
"//src/ray/util:exponential_backoff",
"@boost//:asio",
],
)
Expand Down Expand Up @@ -2510,6 +2518,7 @@ pyx_library(
"//:stats_lib",
"//src/ray/protobuf:serialization_cc_proto",
"//src/ray/util",
"//src/ray/util:memory",
],
)

Expand Down
2 changes: 1 addition & 1 deletion binder/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Set up requirements needed to build a binder server to launch into.
-r ../doc/requirements-doc.txt
-r ../python/requirements.txt
ray[rllib, serve, tune]
ray[rllib, serve, tune]
6 changes: 0 additions & 6 deletions ci/docker/base.gpu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ ENV RAY_INSTALL_JAVA=0
ENV BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
ENV BUILDKITE_COMMIT=${BUILDKITE_COMMIT}
ENV BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
# For wheel build
# https://github.com/docker-library/docker/blob/master/20.10/docker-entrypoint.sh
ENV DOCKER_TLS_CERTDIR=/certs
ENV DOCKER_HOST=tcp://docker:2376
ENV DOCKER_TLS_VERIFY=1
ENV DOCKER_CERT_PATH=/certs/client
ENV TRAVIS_COMMIT=${BUILDKITE_COMMIT}
ENV BUILDKITE_BAZEL_CACHE_URL=${REMOTE_CACHE_URL}

Expand Down
6 changes: 0 additions & 6 deletions ci/docker/base.test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ ENV PYTHON=$PYTHON
ENV RAY_USE_RANDOM_PORTS=1
ENV RAY_DEFAULT_BUILD=1
ENV RAY_INSTALL_JAVA=0
# For wheel build
# https://github.com/docker-library/docker/blob/master/20.10/docker-entrypoint.sh
ENV DOCKER_TLS_CERTDIR=/certs
ENV DOCKER_HOST=tcp://docker:2376
ENV DOCKER_TLS_VERIFY=1
ENV DOCKER_CERT_PATH=/certs/client
ENV BUILDKITE_BAZEL_CACHE_URL=${BUILDKITE_BAZEL_CACHE_URL}

RUN <<EOF
Expand Down
6 changes: 0 additions & 6 deletions ci/docker/core.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ FROM $DOCKER_IMAGE_BASE_BUILD

ARG RAYCI_IS_GPU_BUILD=false

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
6 changes: 0 additions & 6 deletions ci/docker/data-tfxbsl.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ ARG ARROW_VERSION=14.*
ARG ARROW_MONGO_VERSION=
ARG RAY_CI_JAVA_BUILD=

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
8 changes: 1 addition & 7 deletions ci/docker/data.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ ARG ARROW_VERSION=14.*
ARG ARROW_MONGO_VERSION=
ARG RAY_CI_JAVA_BUILD=

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand All @@ -35,7 +29,7 @@ sudo apt-get install -y mongodb
sudo rm -rf /var/lib/mongodb/mongod.lock

if [[ $RAY_CI_JAVA_BUILD == 1 ]]; then
# These packages increase the image size quite a bit, so we only install them
# These packages increase the image size quite a bit, so we only install them
# as needed.
sudo apt-get install -y -qq maven openjdk-8-jre openjdk-8-jdk
fi
Expand Down
6 changes: 0 additions & 6 deletions ci/docker/doc.build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_build
FROM $DOCKER_IMAGE_BASE_BUILD

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
6 changes: 0 additions & 6 deletions ci/docker/docgpu.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_gpu
FROM $DOCKER_IMAGE_BASE_BUILD

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
6 changes: 0 additions & 6 deletions ci/docker/doctest.build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_build
FROM $DOCKER_IMAGE_BASE_BUILD

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
4 changes: 2 additions & 2 deletions ci/docker/forge.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.3-labs

FROM ubuntu:20.04
FROM ubuntu:22.04

ARG BUILDKITE_BAZEL_CACHE_URL

Expand Down Expand Up @@ -40,7 +40,7 @@ apt-get install -y \

# As a convention, we pin all python packages to a specific version. This
# is to to make sure we can control version upgrades through code changes.
python -m pip install pip==23.2.1 cffi==1.16.0
python -m pip install pip==25.0 cffi==1.16.0

# Needs to be synchronized to the host group id as we map /var/run/docker.sock
# into the container.
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/forge.aarch64.wanda.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "forge-aarch64"
froms:
- ubuntu:20.04
- ubuntu:22.04
build_args:
- BUILDKITE_BAZEL_CACHE_URL
dockerfile: ci/docker/forge.Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/forge.wanda.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "forge"
froms:
- ubuntu:20.04
- ubuntu:22.04
build_args:
- BUILDKITE_BAZEL_CACHE_URL
dockerfile: ci/docker/forge.Dockerfile
Expand Down
20 changes: 20 additions & 0 deletions ci/docker/llm.build.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# syntax=docker/dockerfile:1.3-labs

ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_ml
FROM $DOCKER_IMAGE_BASE_BUILD

ARG RAY_CI_JAVA_BUILD=

SHELL ["/bin/bash", "-ice"]

COPY . .

RUN <<EOF
#!/bin/bash

set -ex

# TODO(comaniac): add other test dependencies here.
pip install -c python/requirements_compiled.txt pytest aiohttp pillow

EOF
9 changes: 9 additions & 0 deletions ci/docker/llm.build.wanda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: "llmbuild"
froms: ["cr.ray.io/rayproject/oss-ci-base_ml"]
dockerfile: ci/docker/llm.build.Dockerfile
srcs:
- ci/env/install-dependencies.sh
- python/requirements.txt
- python/requirements_compiled.txt
tags:
- cr.ray.io/rayproject/llmbuild
6 changes: 0 additions & 6 deletions ci/docker/min.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ FROM $DOCKER_IMAGE_BASE_BUILD
ARG PYTHON_VERSION
ARG EXTRA_DEPENDENCY

# Unset dind settings; we are using the host's docker daemon.
ENV DOCKER_TLS_CERTDIR=
ENV DOCKER_HOST=
ENV DOCKER_TLS_VERIFY=
ENV DOCKER_CERT_PATH=

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
Loading

0 comments on commit 401ade4

Please sign in to comment.