Skip to content

Commit 769875c

Browse files
committed
merge master into branch
Signed-off-by: mattip <matti.picus@gmail.com>
2 parents da536f5 + 48a6e7f commit 769875c

File tree

807 files changed

+22450
-9061
lines changed

Some content is hidden

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

807 files changed

+22450
-9061
lines changed

.buildkite/core.rayci.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,20 @@ steps:
292292
- "3.12"
293293
- "3.13"
294294

295-
# cpp tests
296295
- label: ":ray: core: cgroup tests"
297296
tags: core_cpp
298297
instance_type: medium
299298
commands:
300-
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --only-tags=cgroup --build-type cgroup
301-
--privileged --cache-test-results
299+
- RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //:all //src/ray/common/cgroup2/tests/... core --build-type clang --cache-test-results
300+
- docker run --privileged -i --rm --volume /tmp/artifacts:/artifact-mount --shm-size=2.5gb
301+
"$${RAYCI_WORK_REPO}":"$${RAYCI_BUILD_ID}"-corebuild /bin/bash
302+
"./src/ray/common/cgroup2/integration_tests/sysfs_cgroup_driver_integration_test_entrypoint.sh"
302303

303304
- label: ":ray: core: cpp tests"
304305
tags: core_cpp
305306
instance_type: medium
306307
commands:
307-
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --except-tags=cgroup --build-type clang
308+
- RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --except-tags=cgroup --build-type clang
308309
--cache-test-results --parallelism-per-worker 2
309310

310311
# block on premerge and microcheck
@@ -317,7 +318,7 @@ steps:
317318
tags: core_cpp
318319
instance_type: medium
319320
commands:
320-
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --except-tags=cgroup
321+
- RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core --except-tags=cgroup
321322
--build-type asan-clang --cache-test-results --parallelism-per-worker 2
322323
depends_on:
323324
- block-core-cpp-sanitizer-tests
@@ -327,7 +328,7 @@ steps:
327328
tags: core_cpp
328329
instance_type: large
329330
commands:
330-
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
331+
- RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
331332
--build-type ubsan --except-tags no_ubsan,cgroup
332333
--cache-test-results --parallelism-per-worker 2
333334
depends_on:
@@ -338,27 +339,13 @@ steps:
338339
tags: core_cpp
339340
instance_type: medium
340341
commands:
341-
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
342+
- RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
342343
--build-type tsan-clang --except-tags no_tsan,cgroup
343344
--cache-test-results --parallelism-per-worker 2
344345
depends_on:
345346
- block-core-cpp-sanitizer-tests
346347
- corebuild
347348

348-
- label: ":ray: core: flaky cpp tests"
349-
key: core_flaky_cpp_tests
350-
tags:
351-
- python
352-
- flaky
353-
- skip-on-premerge
354-
instance_type: large
355-
soft_fail: true
356-
commands:
357-
- bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core
358-
--run-flaky-tests --build-type clang
359-
depends_on:
360-
- corebuild
361-
362349
- label: ":ray: core: flaky tests"
363350
key: core_flaky_tests
364351
tags:

.buildkite/lint.rayci.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,21 @@ steps:
3535
commands:
3636
- ./ci/lint/lint.sh pre_commit_pydoclint
3737

38-
- label: ":lint-roller: lint: {{matrix}}"
38+
- label: ":lint-roller: python API: {{matrix}}"
3939
tags:
4040
- oss
41-
- lint
42-
- always
41+
- python
42+
- dashboard
43+
- ray_client
44+
- data
45+
- serve
46+
- ml
47+
- tune
48+
- train
49+
- llm
50+
- rllib
51+
- rllib_gpu
52+
- doc
4353
key: lint-medium
4454
instance_type: medium
4555
depends_on: docbuild

.github/CODEOWNERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Common directory shared by core and the libraries.
4141
# @edoakes is the czar for now because the pattern is new.
42-
/python/ray/_common/ @edoakes @aslonnie
42+
/python/ray/_common/ @edoakes @jjyao
4343

4444
# Ray data.
4545
/python/ray/data/ @ray-project/ray-data
@@ -67,6 +67,7 @@
6767

6868
# LLM
6969
/python/ray/llm/ @ray-project/ray-llm
70+
/python/ray/data/llm.py @ray-project/ray-llm
7071

7172
# Ray Serve
7273
/python/ray/serve/ @ray-project/ray-serve
@@ -78,8 +79,8 @@
7879
/python/requirements/ml/dl-gpu-requirements.txt @richardliaw @matthewdeng
7980

8081
# Ray symbol export
81-
/src/ray/ray_version_script.lds @aslonnie
82-
/src/ray/ray_exported_symbols.lds @aslonnie
82+
/src/ray/ray_version_script.lds @ray-project/ray-core
83+
/src/ray/ray_exported_symbols.lds @ray-project/ray-core
8384

8485
# Ray usage stats
8586
/python/ray/_private/usage/ @edoakes @richardliaw @jjyao
@@ -111,8 +112,8 @@
111112
# on their own.
112113
/release/ray_release/byod/*.sh
113114

114-
/.github/ISSUE_TEMPLATE/ @aslonnie
115+
/.github/ISSUE_TEMPLATE/ @ray-project/ray-ci
115116

116117
/.github/workflows/ @ray-project/ray-ci
117118

118-
/.gemini/ @edoakes @aslonnie
119+
/.gemini/ @edoakes @ray-project/ray-ci

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ repos:
4444
args: [ --fix, --exit-non-zero-on-fix ]
4545
- id: ruff
4646
args: [ --select, "I", --fix, --exit-non-zero-on-fix ]
47-
files: '^python/ray/serve/|^python/ray/train|^python/ray/data|^python/ray/_private/|^python/ray/llm/|^python/ray/tune/|^python/ray/includes/|^python/ray/internal/|^python/ray/ray_operator/|^python/ray/scripts/|^python/ray/streaming/|^python/ray/dag/|^python/ray/tests/'
4847

4948
- repo: https://github.com/jsh9/pydoclint
5049
rev: "0.6.6"

.vale/styles/config/vocabularies/General/accept.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ autoscales
3333
bool
3434
breakpoint
3535
BTS
36+
bursty
3637
chatbot
3738
CLI
3839
configs
@@ -45,8 +46,10 @@ deserialize
4546
deserializes
4647
dev
4748
dev to prod
48-
disable
49+
[d|D]isable[d]
50+
[d|D]isable
4951
DLinear
52+
Dockerfile
5053
DPO
5154
EKS
5255
ETDataset
@@ -69,13 +72,15 @@ LMs
6972
LSH
7073
MCP
7174
Megatron
75+
Mixtral
7276
MLflow
7377
MLOps
7478
namespace
7579
NER
7680
Nsight
7781
NumPy
7882
NVIDIA
83+
NVLink
7984
OOM
8085
open-source
8186
PACK
@@ -86,6 +91,8 @@ pretraining
8691
productionize
8792
Pythonic
8893
QPS
94+
Qwen
95+
Quantizing
8996
retrigger
9097
RISECamp
9198
RLHF
@@ -104,6 +111,7 @@ teardown
104111
uncaptured
105112
URI(s)?
106113
UUID
114+
USD
107115
uv
108116
verl
109117
VM(s)?

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ray_cc_library(
130130
),
131131
deps = [
132132
"//src/ray/common:asio",
133-
"//src/ray/raylet_client:raylet_client_interface",
133+
"//src/ray/rpc:raylet_client_interface",
134134
],
135135
)
136136

bazel/gen_extract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from typing import List, Optional
21
import os
32
import shutil
43
import subprocess
4+
from typing import List, Optional
55

66
import runfiles
77

ci/build/build-manylinux-forge.sh

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ set -exuo pipefail
55

66
BAZELISK_VERSION="v1.26.0"
77

8-
platform="linux"
8+
ARCH="$(uname -m)"
99

10-
echo "Architecture(HOSTTYPE) is ${HOSTTYPE}"
10+
case "$ARCH" in
11+
x86_64|amd64)
12+
ARCH="x86_64"
13+
;;
14+
aarch64|arm64)
15+
ARCH="aarch64"
16+
;;
17+
*)
18+
echo "Unsupported arch: $ARCH" >&2
19+
exit 1
20+
;;
21+
esac
22+
23+
echo "Architecture is ${ARCH}"
1124

1225
if [[ ! -e /usr/bin/nproc ]]; then
1326
echo -e '#!/bin/bash\necho 10' > "/usr/bin/nproc"
@@ -16,7 +29,7 @@ fi
1629

1730
# Install ray cpp dependencies.
1831
sudo yum -y install unzip zip sudo openssl xz
19-
if [[ "${HOSTTYPE-}" == "x86_64" ]]; then
32+
if [[ "${ARCH}" == "x86_64" ]]; then
2033
sudo yum -y install libasan-4.8.5-44.el7.x86_64 libubsan-7.3.1-5.10.el7.x86_64 \
2134
devtoolset-8-libasan-devel.x86_64
2235
fi
@@ -30,28 +43,36 @@ if [[ "${RAYCI_DISABLE_JAVA:-false}" != "true" && "${RAY_INSTALL_JAVA:-1}" == "1
3043
export JAVA_HOME="${JAVA_BIN%jre/bin/java}"
3144
fi
3245

33-
# Install ray dashboard dependencies.
34-
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
35-
source "$HOME"/.nvm/nvm.sh
46+
# Install nodejs
47+
NODE_VERSION_FULL="${NODE_VERSION_FULL:-14.21.3}"
48+
49+
if [[ "${ARCH}" == "x86_64" ]]; then
50+
NODE_URL="https://nodejs.org/dist/v${NODE_VERSION_FULL}/node-v${NODE_VERSION_FULL}-linux-x64.tar.xz"
51+
NODE_SHA256="05c08a107c50572ab39ce9e8663a2a2d696b5d262d5bd6f98d84b997ce932d9a"
52+
else # aarch64
53+
NODE_URL="https://nodejs.org/dist/v${NODE_VERSION_FULL}/node-v${NODE_VERSION_FULL}-linux-arm64.tar.xz"
54+
NODE_SHA256="f06642bfcf0b8cc50231624629bec58b183954641b638e38ed6f94cd39e8a6ef"
55+
fi
3656

37-
NODE_VERSION="14"
38-
nvm install "$NODE_VERSION"
39-
nvm use "$NODE_VERSION"
57+
NODE_DIR="/usr/local/node"
58+
curl -fsSL "${NODE_URL}" -o /tmp/node.tar.xz
59+
echo "$NODE_SHA256 /tmp/node.tar.xz" | sha256sum -c -
60+
sudo mkdir -p "$NODE_DIR"
61+
sudo tar -xf /tmp/node.tar.xz -C "$NODE_DIR" --strip-components=1
62+
rm /tmp/node.tar.xz
4063

4164
# Install bazel
4265
mkdir -p "$HOME"/bin
43-
if [[ "${HOSTTYPE}" == "aarch64" || "${HOSTTYPE}" = "arm64" ]]; then
44-
# architecture is "aarch64", but the bazel tag is "arm64"
45-
BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${platform}-arm64"
46-
elif [[ "${HOSTTYPE}" == "x86_64" ]]; then
47-
BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${platform}-amd64"
48-
else
49-
echo "Could not found matching bazelisk URL for platform ${platform} and architecture ${HOSTTYPE}"
50-
exit 1
66+
if [[ "${ARCH}" == "x86_64" ]]; then
67+
BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-linux-amd64"
68+
else # aarch64
69+
BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-linux-arm64"
5170
fi
52-
curl -sSfL -o "$HOME"/bin/bazelisk "${BAZELISK_URL}"
53-
chmod +x "$HOME"/bin/bazelisk
54-
sudo ln -sf "$HOME"/bin/bazelisk /usr/local/bin/bazel
71+
72+
curl -sSfL -o /tmp/bazelisk "${BAZELISK_URL}"
73+
chmod +x /tmp/bazelisk
74+
sudo mv /tmp/bazelisk /usr/local/bin/bazelisk
75+
sudo ln -sf /usr/local/bin/bazelisk /usr/local/bin/bazel
5576

5677
# Use python3.9 as default python3
5778
sudo ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3

ci/build/build-manylinux-ray.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ if [[ "${RAY_INSTALL_JAVA}" == "1" ]]; then
1111
bazel build //java:ray_java_pkg
1212
fi
1313

14+
export PATH="/usr/local/node/bin:$PATH"
15+
1416
# Build ray dashboard
15-
cd python/ray/dashboard/client
16-
npm ci
17-
npm run build
17+
(
18+
cd python/ray/dashboard/client
19+
npm ci
20+
npm run build
21+
)

0 commit comments

Comments
 (0)