Skip to content

Commit 752dddc

Browse files
authored
Merge branch 'master' into patch-1
2 parents e66f19b + c041e83 commit 752dddc

File tree

877 files changed

+31727
-18888
lines changed

Some content is hidden

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

877 files changed

+31727
-18888
lines changed

.buildkite/BUILD.bazel

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

44
py_binary(
55
name = "copy_files",

.buildkite/build.rayci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,14 @@ steps:
115115
- "3.9"
116116
- "3.10"
117117
- "3.11"
118+
118119
- label: ":tapioca: smoke test build-docker.sh"
119120
tags:
120121
- python_dependencies
121122
- docker
122123
- oss
123124
instance_type: medium
125+
soft_fail: true
124126
commands:
125127
- export WHEEL_URL="https://files.pythonhosted.org/packages/7e/7c/3544cca730265bb6f7a4900b7b7018c08ce5ec89bf7b6102901fe0bcd67b/ray-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
126128
- export CPP_WHEEL_URL="https://files.pythonhosted.org/packages/50/ae/c094818fd526bfb0a361a76bda5708a73cbc888b51edfc7d6aab9de837cd/ray_cpp-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"

.buildkite/data.rayci.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ steps:
4444
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}"
4545
--worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
4646
--build-name data9build
47-
--except-tags data_integration,doctest,data_non_parallel,dask
47+
--except-tags data_integration,doctest,data_non_parallel,dask,needs_credentials
4848
depends_on: data9build
4949

5050
- label: ":database: data: arrow v9 tests (data_non_parallel)"
@@ -69,7 +69,7 @@ steps:
6969
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}"
7070
--worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
7171
--build-name datalbuild
72-
--except-tags data_integration,doctest,data_non_parallel,dask
72+
--except-tags data_integration,doctest,data_non_parallel,dask,needs_credentials
7373
depends_on: datalbuild
7474

7575
- label: ":database: data: arrow v20 tests (data_non_parallel)"
@@ -94,7 +94,7 @@ steps:
9494
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... //python/ray/air/... data
9595
--workers 2 --worker-id {{matrix.worker_id}} --parallelism-per-worker 3
9696
--python-version {{matrix.python}}
97-
--except-tags data_integration,doctest,data_non_parallel,dask
97+
--except-tags data_integration,doctest,data_non_parallel,dask,needs_credentials
9898
depends_on: databuild-multipy
9999
matrix:
100100
setup:
@@ -128,7 +128,7 @@ steps:
128128
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}"
129129
--worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
130130
--build-name datanbuild
131-
--except-tags data_integration,doctest,data_non_parallel,dask
131+
--except-tags data_integration,doctest,data_non_parallel,dask,needs_credentials
132132
depends_on: datanbuild
133133
soft_fail: true
134134

@@ -272,3 +272,19 @@ steps:
272272
--build-name docgpubuild
273273
--only-tags gpu,gpu_only
274274
depends_on: docgpubuild
275+
- label: ":data: postmerge authenticated tests"
276+
key: data_postmerge_authenticated_tests
277+
tags:
278+
- python
279+
- data
280+
- oss
281+
- skip-on-premerge
282+
instance_type: medium
283+
commands:
284+
- pip install -U boto3==1.28.70 awscli==1.29.70
285+
- $(python ci/env/setup_credentials.py)
286+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... data
287+
--build-name datalbuild
288+
--only-tags needs_credentials
289+
--test-env=SNOWFLAKE_USER --test-env=SNOWFLAKE_ACCOUNT --test-env=SNOWFLAKE_DATABASE --test-env=SNOWFLAKE_SCHEMA --test-env=SNOWFLAKE_WAREHOUSE --test-env=SNOWFLAKE_PRIVATE_KEY
290+
depends_on: datalbuild

.buildkite/macos/macos.rayci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ steps:
3939
- macos_wheels
4040
- oss
4141
job_env: MACOS
42-
instance_type: macos
42+
instance_type: macos-arm64
4343
commands:
4444
- ./ci/ray_ci/macos/macos_ci.sh run_small_test
4545

@@ -51,7 +51,7 @@ steps:
5151
- macos_wheels
5252
- oss
5353
job_env: MACOS
54-
instance_type: macos
54+
instance_type: macos-arm64
5555
commands:
5656
- ./ci/ray_ci/macos/macos_ci.sh run_medium_a_j_test
5757

@@ -63,7 +63,7 @@ steps:
6363
- macos_wheels
6464
- oss
6565
job_env: MACOS
66-
instance_type: macos
66+
instance_type: macos-arm64
6767
commands:
6868
- ./ci/ray_ci/macos/macos_ci.sh run_medium_k_z_test
6969

@@ -75,7 +75,7 @@ steps:
7575
- macos_wheels
7676
- oss
7777
job_env: MACOS
78-
instance_type: macos
78+
instance_type: macos-arm64
7979
parallelism: 3
8080
commands:
8181
- ./ci/ray_ci/macos/macos_ci.sh run_large_test
@@ -89,7 +89,7 @@ steps:
8989
- macos_wheels
9090
- oss
9191
job_env: MACOS
92-
instance_type: macos
92+
instance_type: macos-arm64
9393
commands:
9494
- ./ci/ray_ci/macos/macos_ci.sh run_core_dashboard_test
9595

@@ -116,7 +116,7 @@ steps:
116116
- flaky
117117
- skip_on_premerge
118118
job_env: MACOS
119-
instance_type: macos
119+
instance_type: macos-arm64
120120
soft_fail: true
121121
commands:
122122
- ./ci/ray_ci/macos/macos_ci.sh run_flaky_tests

.buildkite/release-automation/pre_release.rayci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ steps:
3636
message: "Triggered by release-automation build #${BUILDKITE_BUILD_NUMBER}"
3737
env:
3838
RAYCI_RELEASE: 1
39+
RAYCI_DISABLE_TEST_DB: "1"
3940

4041
- label: "Trigger Postmerge nightly build & test"
4142
if: build.env("RAYCI_WEEKLY_RELEASE_NIGHTLY") == "1"
@@ -47,8 +48,9 @@ steps:
4748
branch: "${BUILDKITE_BRANCH}"
4849
message: "Triggered by release-automation build #${BUILDKITE_BUILD_NUMBER}"
4950
env:
50-
RAYCI_RELEASE: 1
51+
RAYCI_RELEASE: "1"
5152
RAYCI_SCHEDULE: "nightly"
53+
RAYCI_DISABLE_TEST_DB: "1"
5254

5355
- label: "Check Ray commit in {{matrix}} nightly images"
5456
key: check-ray-commit
@@ -72,7 +74,7 @@ steps:
7274
env:
7375
# KubeRay CI will pull an image based on this commit and the current date
7476
RAY_NIGHTLY_COMMIT: "${BUILDKITE_COMMIT}"
75-
IS_FROM_RAY_RELEASE_AUTOMATION: 1
77+
IS_FROM_RAY_RELEASE_AUTOMATION: "1"
7678

7779
- label: "Trigger Postmerge MacOS test"
7880
key: trigger-postmerge-macos
@@ -83,7 +85,8 @@ steps:
8385
branch: "${BUILDKITE_BRANCH}"
8486
message: "Triggered by release-automation build #${BUILDKITE_BUILD_NUMBER}"
8587
env:
86-
RAYCI_RELEASE: 1
88+
RAYCI_RELEASE: "1"
89+
RAYCI_DISABLE_TEST_DB: "1"
8790

8891
- block: "Trigger Release nightly test"
8992
if: build.env("RAYCI_WEEKLY_RELEASE_NIGHTLY") != "1"

.buildkite/serve.rayci.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ steps:
2121
wanda: ci/docker/servepydantic1.build.wanda.yaml
2222
tags: cibase
2323

24+
- name: servetracingbuild
25+
wanda: ci/docker/servetracing.build.wanda.yaml
26+
2427
- name: minbuild-serve
2528
label: "wanda: minbuild-{{matrix}}-py39"
2629
wanda: ci/docker/min.build.wanda.yaml
@@ -41,7 +44,7 @@ steps:
4144
instance_type: large
4245
commands:
4346
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
44-
--except-tags post_wheel_build,gpu,ha_integration
47+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
4548
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
4649
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9
4750
depends_on: "servebuild"
@@ -55,7 +58,7 @@ steps:
5558
soft_fail: true
5659
commands:
5760
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
58-
--except-tags post_wheel_build,gpu,ha_integration
61+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
5962
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
6063
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
6164
depends_on: servepydantic1build
@@ -69,7 +72,7 @@ steps:
6972
soft_fail: true
7073
commands:
7174
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
72-
--except-tags post_wheel_build,gpu,ha_integration
75+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
7376
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
7477
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=RAY_SERVE_RUN_USER_CODE_IN_SEPARATE_THREAD=0
7578
depends_on: "servebuild"
@@ -82,7 +85,7 @@ steps:
8285
instance_type: large
8386
commands:
8487
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
85-
--except-tags post_wheel_build,gpu,ha_integration
88+
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
8689
--workers 2 --worker-id {{matrix.worker_id}} --parallelism-per-worker 3
8790
--python-version {{matrix.python}}
8891
--test-env=EXPECTED_PYTHON_VERSION={{matrix.python}}
@@ -185,6 +188,16 @@ steps:
185188
- raycpubase
186189
- servebuild
187190

191+
- label: ":ray-serve: serve: tracing tests"
192+
tags:
193+
- serve
194+
- python
195+
instance_type: medium
196+
commands:
197+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
198+
--only-tags serve_tracing --build-name servetracingbuild
199+
depends_on: servetracingbuild
200+
188201
- label: ":ray-serve: serve: doc gpu tests"
189202
tags:
190203
- serve

.github/CODEOWNERS

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,60 +14,26 @@
1414

1515
# ==== Ray core ====
1616

17-
# API compatibility
18-
/src/ray/protobuf/common.proto @pcmoritz @raulchen @ray-project/ray-core
19-
/src/ray/protobuf/gcs.proto @pcmoritz @raulchen @ray-project/ray-core
20-
/src/ray/protobuf/gcs_service.proto @pcmoritz @raulchen @ray-project/ray-core
21-
22-
# Autoscaler
23-
/python/ray/autoscaler/ @ray-project/ray-core
24-
25-
# Metrics
26-
/src/ray/stats/metric_defs.h @ray-project/ray-core
27-
/src/ray/stats/metric_defs.cc @ray-project/ray-core
28-
29-
# Telemetry
30-
/src/ray/protobuf/usage.proto @pcmoritz @thomasdesr
31-
3217
# All C++ code.
33-
# /src/ray @ray-project/ray-core-cpp
34-
35-
# GCS
36-
/src/ray/gcs/ @ray-project/ray-core
37-
38-
# Dependencies
39-
/python/setup.py @richardliaw @edoakes @aslonnie
40-
41-
# CI
42-
/ci/lint/format.sh @ray-project/ray-ci
43-
/ci/docker @ray-project/ray-ci
44-
/ci/ray_ci @ray-project/ray-ci
18+
/src/ @ray-project/ray-core
4519

4620
# Python worker.
47-
#/python/ray/ @ray-project/ray-core
48-
#!/python/ray/tune/ @ray-project/ray-core
49-
#!/python/ray/rllib/ @ray-project/ray-core
21+
/python/ray/ @ray-project/ray-core
5022

5123
# Java worker.
52-
/java/dependencies.bzl @kfstorm @raulchen @WangTaoTheTonic @SongGuyang
53-
/java/pom.xml @kfstorm @raulchen @WangTaoTheTonic @SongGuyang
54-
/java/pom_template.xml @kfstorm @raulchen @WangTaoTheTonic @SongGuyang
55-
/java/*/pom_template.xml @kfstorm @raulchen @WangTaoTheTonic @SongGuyang
56-
/java/api/ @kfstorm @raulchen @WangTaoTheTonic @SongGuyang
24+
/java/ @kfstorm @raulchen @WangTaoTheTonic @SongGuyang @ray-project/ray-core
5725

5826
# C++ worker
59-
/cpp/include/ray @SongGuyang @raulchen @kfstorm @ray-project/ray-core
60-
61-
# Ray Client
62-
/src/ray/protobuf/ray_client.proto @ray-project/ray-core
27+
/cpp/ @SongGuyang @raulchen @kfstorm @ray-project/ray-core
6328

64-
# Runtime Env
65-
# TODO(SongGuyang): Add new items to guarantee runtime env API compatibility in multiple languages.
66-
/src/ray/protobuf/runtime_env_common.proto @SongGuyang @raulchen @edoakes @ray-project/ray-core
67-
/src/ray/protobuf/runtime_env_agent.proto @SongGuyang @raulchen @edoakes @ray-project/ray-core
29+
/doc/source/cluster/ @ray-project/ray-core @ray-project/ray-docs
30+
/doc/source/ray-core/ @ray-project/ray-core @ray-project/ray-docs
6831

6932
# ==== Libraries and frameworks ====
7033

34+
# Dependencies
35+
/python/setup.py @richardliaw @edoakes @aslonnie
36+
7137
# Common directory shared by core and the libraries.
7238
# @edoakes is the czar for now because the pattern is new.
7339
/python/ray/_common/ @edoakes @aslonnie
@@ -84,9 +50,6 @@
8450
/rllib/ @ray-project/ray-rllib
8551
/doc/source/rllib/ @ray-project/ray-rllib @ray-project/ray-docs
8652

87-
# Cluster (docs)
88-
/doc/source/cluster/ @pcmoritz @kevin85421 @ray-project/ray-docs
89-
9053
# Tune
9154
/python/ray/tune/ @ray-project/ray-tune
9255
/doc/source/tune/ @ray-project/ray-tune @ray-project/ray-docs
@@ -100,6 +63,7 @@
10063

10164
# Ray Serve
10265
/python/ray/serve/ @ray-project/ray-serve
66+
/src/ray/protobuf/serve.proto @ray-project/ray-serve
10367
/doc/source/serve/ @ray-project/ray-serve @ray-project/ray-docs
10468

10569
# ML Docker Dependencies
@@ -113,6 +77,7 @@
11377
# Ray usage stats
11478
/python/ray/_private/usage/ @edoakes @richardliaw @jjyao
11579
/python/ray/dashboard/modules/usage_stats/ @edoakes @richardliaw @jjyao
80+
/src/ray/protobuf/usage.proto @pcmoritz @thomasdesr
11681

11782

11883
# ==== Build and CI ====
@@ -125,6 +90,11 @@
12590
# CI scripts.
12691
#/ci/ @ray-project/ray-core @ray-project/ray-ci
12792

93+
# CI
94+
/ci/lint/format.sh @ray-project/ray-ci
95+
/ci/docker @ray-project/ray-ci
96+
/ci/ray_ci @ray-project/ray-ci
97+
12898
# Buildkite pipeline management
12999
.buildkite/hooks @ray-project/ray-ci
130100

.github/workflows/stale_pull_request.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
exempt-pr-labels: >
5858
weekly-release-blocker,
5959
release-blocker,
60-
bounced
60+
unstale
6161
6262
# Set to true to ignore PRs in a milestone (defaults to false)
6363
exempt-all-pr-milestones: true
@@ -69,7 +69,7 @@ jobs:
6969
# Remove stale label from PRs on update (default is true)
7070
remove-pr-stale-when-updated: true
7171

72-
# Add bounced label. Whenever a PR is marked as 'bounced' it will not be marked stale again.
73-
labels-to-add-when-unstale: bounced
72+
# Add unstale label. Whenever a PR is marked as 'unstale' it will not be marked stale again.
73+
labels-to-add-when-unstale: unstale
7474

7575
ascending: true

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ repos:
7373
hooks:
7474
- id: cpplint
7575
args: ["--filter=-whitespace/braces,-whitespace/line_length,-build/c++11,-build/c++14,-build/c++17,-readability/braces,-whitespace/indent_namespace,-runtime/int,-runtime/references,-build/include_order"]
76-
files: ^src/ray/(util|raylet_client|internal|scheduling|pubsub|object_manager|rpc(?:/.*)?|raylet|core_worker)/.*\.(h|cc)$
76+
files: ^src/ray/(common/ray_syncer|util|raylet_client|internal|scheduling|pubsub|object_manager|rpc(?:/.*)?|raylet|core_worker)/.*\.(h|cc)$
7777
exclude: |
7878
(?x)^(
7979
src/ray/raylet/scheduling/.*\.(h|cc)$ |
@@ -84,9 +84,9 @@ repos:
8484
rev: 8.0.1
8585
hooks:
8686
- id: buildifier
87-
files: ^(src|cpp|python|rllib)(/[^/]+)*/BUILD$
87+
files: ^(src|cpp|python|rllib|ci|release|java)(/[^/]+)*/BUILD(\.bazel)?$|^BUILD.bazel$
8888
- id: buildifier-lint
89-
files: ^(src|cpp|python|rllib)(/[^/]+)*/BUILD$
89+
files: ^(src|cpp|python|rllib|ci|release|java)(/[^/]+)*/BUILD(\.bazel)?$|^BUILD.bazel$
9090

9191
- repo: https://github.com/psf/black
9292
rev: 22.10.0

.rayciversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.16.0
1+
0.17.0

0 commit comments

Comments
 (0)