Skip to content

Commit 726eda8

Browse files
authored
Merge branch 'master' into fix-timezone-ui
2 parents 4ae9959 + 58c081a commit 726eda8

File tree

706 files changed

+28931
-10164
lines changed

Some content is hidden

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

706 files changed

+28931
-10164
lines changed

.buildkite/build.rayci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
tags:
2323
- linux_wheels
2424
- oss
25-
instance_type: medium
25+
instance_type: large
2626
commands:
2727
- bazel run //ci/ray_ci:build_in_docker -- wheel --build-type debug --upload
2828
depends_on:

.buildkite/core.rayci.yml

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,24 @@ steps:
5656
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/_common/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
5757
--install-mask all-ray-libraries
5858
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
59-
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu
59+
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu,spark_on_ray,ray_client,compiled_graphs
6060
--install-mask all-ray-libraries
6161
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
6262
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}"
6363
--only-tags use_all_core --skip-ray-installation
6464

65+
- label: ":ray: core: cgraph python tests"
66+
tags:
67+
- compiled_graphs
68+
instance_type: large
69+
commands:
70+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/dag/... core
71+
--install-mask all-ray-libraries
72+
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
73+
--only-tags compiled_graphs
74+
--except-tags multi_gpu
75+
--install-mask all-ray-libraries
76+
6577
- label: ":ray: core: python {{matrix.python}} tests ({{matrix.worker_id}})"
6678
if: build.pull_request.labels includes "continuous-build" || pipeline.id == "0189e759-8c96-4302-b6b5-b4274406bf89" || pipeline.id == "018f4f1e-1b73-4906-9802-92422e3badaa"
6779
tags:
@@ -73,7 +85,7 @@ steps:
7385
--install-mask all-ray-libraries
7486
--workers 4 --worker-id "{{matrix.worker_id}}" --parallelism-per-worker 3
7587
--python-version {{matrix.python}}
76-
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu
88+
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu,spark_on_ray,ray_client
7789
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
7890
--install-mask all-ray-libraries
7991
--workers 4 --worker-id "{{matrix.worker_id}}" --parallelism-per-worker 3
@@ -85,6 +97,16 @@ steps:
8597
python: ["3.12"]
8698
worker_id: ["0", "1", "2", "3"]
8799

100+
- label: ":ray: core: ray client tests"
101+
tags:
102+
- ray_client
103+
instance_type: large
104+
commands:
105+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core
106+
--install-mask all-ray-libraries
107+
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
108+
--only-tags ray_client
109+
88110
- label: ":ray: core: redis tests"
89111
tags:
90112
- python
@@ -97,7 +119,7 @@ steps:
97119
--install-mask all-ray-libraries
98120
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
99121
--test-env=TEST_EXTERNAL_REDIS=1
100-
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu
122+
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu,spark_on_ray,ray_client
101123
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
102124
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}"
103125
--only-tags use_all_core --skip-ray-installation
@@ -176,7 +198,7 @@ steps:
176198
--except-tags gpu
177199
--skip-ray-installation
178200

179-
- label: ":ray: core: data tests"
201+
- label: ":ray: core: dask & modin tests"
180202
tags: python
181203
instance_type: medium
182204
commands:
@@ -306,12 +328,20 @@ steps:
306328
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --except-tags=cgroup --build-type clang
307329
--cache-test-results --parallelism-per-worker 2
308330

331+
# block on premerge and microcheck
332+
- block: "run cpp sanitizer tests"
333+
if: build.env("BUILDKITE_PIPELINE_ID") == "0189942e-0876-4b8f-80a4-617f988ec59b" || build.env("BUILDKITE_PIPELINE_ID") == "018f4f1e-1b73-4906-9802-92422e3badaa"
334+
key: block-core-cpp-sanitizer-tests
335+
depends_on: []
336+
309337
- label: ":ray: core: cpp asan tests"
310338
tags: core_cpp
311339
instance_type: medium
312340
commands:
313341
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --except-tags=cgroup
314342
--build-type asan-clang --cache-test-results --parallelism-per-worker 2
343+
depends_on:
344+
- block-core-cpp-sanitizer-tests
315345

316346
- label: ":ray: core: cpp ubsan tests"
317347
tags: core_cpp
@@ -320,6 +350,8 @@ steps:
320350
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
321351
--build-type ubsan --except-tags no_ubsan,cgroup
322352
--cache-test-results --parallelism-per-worker 2
353+
depends_on:
354+
- block-core-cpp-sanitizer-tests
323355

324356
- label: ":ray: core: cpp tsan tests"
325357
tags: core_cpp
@@ -328,6 +360,8 @@ steps:
328360
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
329361
--build-type tsan-clang --except-tags no_tsan,cgroup
330362
--cache-test-results --parallelism-per-worker 2
363+
depends_on:
364+
- block-core-cpp-sanitizer-tests
331365

332366
- label: ":ray: core: flaky cpp tests"
333367
key: core_flaky_cpp_tests
@@ -417,6 +451,19 @@ steps:
417451
- raycpubase
418452
- corebuild
419453

454+
- label: ":core: core: spark-on-ray tests"
455+
tags:
456+
- spark_on_ray
457+
instance_type: medium
458+
commands:
459+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core
460+
--build-type debug
461+
--test-env=RAY_ON_SPARK_BACKGROUND_JOB_STARTUP_WAIT=1
462+
--test-env=RAY_ON_SPARK_RAY_WORKER_NODE_STARTUP_INTERVAL=5
463+
--parallelism-per-worker 3
464+
--only-tags spark_on_ray
465+
--except-tags kubernetes
466+
420467
# block on premerge and microcheck
421468
- block: "run multi gpu tests"
422469
if: build.env("BUILDKITE_PIPELINE_ID") == "0189942e-0876-4b8f-80a4-617f988ec59b" || build.env("BUILDKITE_PIPELINE_ID") == "018f4f1e-1b73-4906-9802-92422e3badaa"
@@ -426,7 +473,7 @@ steps:
426473
- label: ":ray: core: multi gpu tests"
427474
key: core-multi-gpu-tests
428475
tags:
429-
- accelerated_dag
476+
- compiled_graphs
430477
- gpu
431478
instance_type: gpu-large
432479
# we're running some cgraph doc tests here as well since they need gpus

.buildkite/data.rayci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ steps:
143143
tags:
144144
- python
145145
- data
146+
- skip-on-premerge
146147
instance_type: medium
147148
commands:
148149
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... data

.buildkite/others.rayci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ steps:
7878
- bazel run //ci/ray_ci/automation:determine_microcheck_tests -- {{matrix}} 100 --test-prefix windows:__ --consider-master-branch --production
7979
matrix:
8080
- "core"
81-
- "serverless"
8281
- "serve"
8382
- "data"
8483
- "ml"

.buildkite/serverless.rayci.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.buildkite/windows.rayci.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,6 @@ steps:
6262
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 2
6363
depends_on: windowsbuild
6464

65-
- label: ":serverless: serverless: :windows: tests"
66-
tags: python
67-
job_env: WINDOWS
68-
instance_type: windows
69-
commands:
70-
- bash ci/ray_ci/windows/install_tools.sh
71-
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... serverless
72-
--build-name windowsbuild
73-
--operating-system windows
74-
--except-tags no_windows
75-
--test-env=CI="1"
76-
--test-env=RAY_CI_POST_WHEEL_TESTS="1"
77-
--test-env=USERPROFILE
78-
--parallelism-per-worker 3
79-
depends_on: windowsbuild
80-
8165
- label: ":ray-serve: serve: :windows: tests"
8266
tags: serve
8367
job_env: WINDOWS
@@ -146,26 +130,6 @@ steps:
146130
depends_on: windowsbuild
147131
soft_fail: true
148132

149-
- label: "flaky :windows: serverless tests"
150-
key: windows_serverless_flaky_tests
151-
tags:
152-
- flaky
153-
- skip-on-premerge
154-
job_env: WINDOWS
155-
instance_type: windows
156-
commands:
157-
- bash ci/ray_ci/windows/install_tools.sh
158-
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... serverless
159-
--except-tags no_windows
160-
--run-flaky-tests
161-
--build-name windowsbuild
162-
--operating-system windows
163-
--test-env=CI="1"
164-
--test-env=RAY_CI_POST_WHEEL_TESTS="1"
165-
--test-env=USERPROFILE
166-
depends_on: windowsbuild
167-
soft_fail: true
168-
169133
- label: "flaky :windows: serve tests"
170134
key: windows_serve_flaky_tests
171135
tags:

.pre-commit-config.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,29 @@ repos:
4343
args: [ --fix, --exit-non-zero-on-fix ]
4444
- id: ruff
4545
args: [ --select, "I", --fix, --exit-non-zero-on-fix ]
46-
files: '^python/ray/serve/|^python/ray/train'
46+
files: '^python/ray/serve/|^python/ray/train|^python/ray/data'
47+
48+
- repo: https://github.com/jsh9/pydoclint
49+
rev: "0.6.6"
50+
hooks:
51+
- id: pydoclint
52+
args: [
53+
--style=google,
54+
--baseline=ci/lint/pydoclint-baseline.txt,
55+
--exclude=thirdparty,
56+
# --generate-baseline=True, # Not generally needed, but documenting since this is how we generate the initial baseline
57+
--auto-regenerate-baseline=True,
58+
# Current settings (not because we think they're right, but because we
59+
# don't want a baseline the size of the codebase)
60+
--arg-type-hints-in-docstring=False,
61+
--skip-checking-raises=True,
62+
--check-return-types=False,
63+
--allow-init-docstring=True,
64+
--check-class-attributes=False,
65+
# --check-style-mismatch=True, # Bring this back once things are a bit cleaner
66+
]
67+
types: [python]
68+
files: '^python/ray/'
4769

4870
- repo: https://github.com/cpplint/cpplint
4971
rev: 2.0.0
Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
# Use 'API' judiciously: https://developers.google.com/style/word-list#api.
2-
API[s]
3-
CPU[s]
4-
GPU[s]
5-
NumPy
6-
URI[s]
72
[Aa]pplication
83
[Cc]odec
4+
[Cc]omposable
5+
[Dd]eduplication
96
[Dd]ict(s)?
7+
[Ee]xoshuffle
8+
[Gg]rafana
109
[Ii]nteroperates
1110
[Ii]nterpretability
11+
[Mm]ultimodal
1212
[Pp]arallelization
1313
[Pp]erformant
14+
[Pp]rofiler
1415
[Ss]ubclassing
15-
Kueue
16-
GKE
17-
namespace
16+
Alibaba
17+
Alpaca
18+
Anyscale
19+
API[s]
1820
ARM
21+
async
22+
autoscales
1923
breakpoint
24+
BTS
25+
CLI
26+
CPU[s]
2027
deduplicate[s]
2128
[Dd]eduplication
2229
[Aa]sync
@@ -30,22 +37,37 @@ UUID
3037
bool
3138
deserializes
3239
PACK
40+
configs
3341
disable
3442
deduplicate(s)?
35-
[Dd]eduplication
36-
Alibaba
43+
DeepSpeed
44+
deserialization
45+
deserialize
46+
dev
47+
dev to prod
48+
DPO
49+
FSDP
50+
GGUF
51+
GKE
52+
GPTQ
53+
GPU[s]
54+
KTO
55+
Kueue
56+
LMs
3757
LSH
38-
BTS
39-
[Mm]ultimodal
58+
Megatron
59+
namespace
60+
NER
61+
Nsight
62+
NumPy
63+
pretraining
4064
Pythonic
41-
[Gg]rafana
42-
CLI
43-
[Ee]xoshuffle
65+
QPS
4466
RISECamp
45-
Anyscale
46-
[Cc]omposable
47-
Nsight
48-
[Pp]rofiler
49-
deserialize
67+
rollouts
68+
SFT
69+
ShareGPT
5070
teardown
51-
deserialization
71+
uncaptured
72+
URI[s]
73+
[Vv]ision LMs

0 commit comments

Comments
 (0)