Skip to content

Commit 115ddcf

Browse files
authored
[core] Mask llm directory when running core tests (#51317)
Remove `python/ray/llm/` directory during core tests to enforce componentization. --------- Signed-off-by: Edward Oakes <ed.nmi.oakes@gmail.com>
1 parent fd5d717 commit 115ddcf

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.buildkite/core.rayci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ steps:
5353
parallelism: 4
5454
commands:
5555
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
56-
--install-mask rllib,serve,train,tune,workflow
56+
--install-mask llm,rllib,serve,train,tune,workflow
5757
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
5858
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu
59-
--install-mask rllib,serve,train,tune,workflow
59+
--install-mask llm,rllib,serve,train,tune,workflow
6060
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
6161
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}"
6262
--only-tags use_all_core --skip-ray-installation
@@ -69,12 +69,12 @@ steps:
6969
instance_type: large
7070
commands:
7171
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
72-
--install-mask rllib,serve,train,tune,workflow
72+
--install-mask llm,rllib,serve,train,tune,workflow
7373
--workers 4 --worker-id "{{matrix.worker_id}}" --parallelism-per-worker 3
7474
--python-version {{matrix.python}}
7575
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu
7676
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
77-
--install-mask rllib,serve,train,tune,workflow
77+
--install-mask llm,rllib,serve,train,tune,workflow
7878
--workers 4 --worker-id "{{matrix.worker_id}}" --parallelism-per-worker 3
7979
--python-version {{matrix.python}}
8080
--only-tags use_all_core --skip-ray-installation
@@ -93,7 +93,7 @@ steps:
9393
parallelism: 4
9494
commands:
9595
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core
96-
--install-mask rllib,serve,train,tune,workflow
96+
--install-mask llm,rllib,serve,train,tune,workflow
9797
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
9898
--test-env=TEST_EXTERNAL_REDIS=1
9999
--except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu
@@ -165,7 +165,7 @@ steps:
165165
--parallelism-per-worker 3
166166
# doc examples
167167
- bazel run //ci/ray_ci:test_in_docker -- //doc/... core
168-
--install-mask rllib,serve,train,tune,workflow
168+
--install-mask llm,rllib,serve,train,tune,workflow
169169
--except-tags gpu,post_wheel_build,mem_pressure,doctest,multi_gpu
170170
--parallelism-per-worker 3
171171
--skip-ray-installation
@@ -176,7 +176,7 @@ steps:
176176
commands:
177177
- bazel run //ci/ray_ci:test_in_docker --
178178
python/ray/util/dask/... python/ray/tests/modin/... core
179-
--install-mask rllib,serve,train,tune,workflow
179+
--install-mask llm,rllib,serve,train,tune,workflow
180180
--build-name datalbuild
181181
--parallelism-per-worker 2
182182
depends_on:
@@ -201,7 +201,7 @@ steps:
201201
instance_type: medium
202202
commands:
203203
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core
204-
--install-mask rllib,serve,train,tune,workflow
204+
--install-mask llm,rllib,serve,train,tune,workflow
205205
--build-type debug
206206
--parallelism-per-worker 3
207207
--only-tags debug_tests
@@ -212,7 +212,7 @@ steps:
212212
instance_type: medium
213213
commands:
214214
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core
215-
--install-mask rllib,serve,train,tune,workflow
215+
--install-mask llm,rllib,serve,train,tune,workflow
216216
--build-type asan
217217
--parallelism-per-worker 2
218218
--only-tags asan_tests
@@ -223,7 +223,7 @@ steps:
223223
instance_type: medium
224224
commands:
225225
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //doc/... core
226-
--install-mask rllib,serve,train,tune,workflow
226+
--install-mask llm,rllib,serve,train,tune,workflow
227227
--build-type wheel
228228
--parallelism-per-worker 3
229229
--only-tags post_wheel_build
@@ -334,7 +334,7 @@ steps:
334334
soft_fail: true
335335
commands:
336336
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/... //doc/... core
337-
--install-mask rllib,serve,train,tune,workflow
337+
--install-mask llm,rllib,serve,train,tune,workflow
338338
--run-flaky-tests
339339
--except-tags multi_gpu
340340

@@ -348,7 +348,7 @@ steps:
348348
soft_fail: true
349349
commands:
350350
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/... //doc/... core
351-
--install-mask rllib,serve,train,tune,workflow
351+
--install-mask llm,rllib,serve,train,tune,workflow
352352
--run-flaky-tests
353353
--gpus 4
354354
--build-name coregpubuild
@@ -392,7 +392,7 @@ steps:
392392
--canonical-tag test_container
393393
- docker build --progress=plain --build-arg BASE_IMAGE="rayproject/ray:test_container"
394394
-t rayproject/ray:runtime_env_container -f ci/docker/runtime_env_container/Dockerfile .
395-
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core --only-tags container --install-mask rllib,serve,train,tune,workflow
395+
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core --only-tags container --install-mask llm,rllib,serve,train,tune,workflow
396396
depends_on:
397397
- manylinux
398398
- forge
@@ -417,7 +417,7 @@ steps:
417417
--gpus 4
418418
--build-name coregpubuild
419419
--only-tags multi_gpu
420-
--install-mask rllib,serve,train,tune,workflow
420+
--install-mask llm,rllib,serve,train,tune,workflow
421421
depends_on:
422422
- block-core-gpu-tests
423423
- coregpubuild

ci/ray_ci/tests.env.Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ fi
3737

3838
if [[ "$RAY_INSTALL_MASK" != "" ]]; then
3939
echo "--- Apply mask: $RAY_INSTALL_MASK"
40+
if [[ "$RAY_INSTALL_MASK" =~ llm ]]; then
41+
rm -rf python/ray/llm
42+
fi
4043
if [[ "$RAY_INSTALL_MASK" =~ rllib ]]; then
4144
# Remove the actual directory and the symlink.
4245
rm -rf rllib python/ray/rllib

0 commit comments

Comments
 (0)