Skip to content

Commit 3ea54d3

Browse files
sampan-s-nayaksampan-s-nayak
authored
Merge branch 'master' into can-event02
2 parents f895f57 + 7a307de commit 3ea54d3

File tree

186 files changed

+2695
-986
lines changed

Some content is hidden

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

186 files changed

+2695
-986
lines changed

‎.buildkite/_forge.rayci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@ steps:
66
- name: manylinux
77
wanda: ci/docker/manylinux.wanda.yaml
88

9+
- name: raycpubase
10+
label: "wanda: ray.py{{matrix}}.cpu.base"
11+
tags:
12+
- python_dependencies
13+
- docker
14+
wanda: ci/docker/ray.cpu.base.wanda.yaml
15+
matrix:
16+
- "3.9"
17+
- "3.10"
18+
- "3.11"
19+
- "3.12"
20+
env:
21+
PYTHON_VERSION: "{{matrix}}"
22+
923
- name: raycudabase
1024
label: "wanda: ray.py{{matrix.python}}.cu{{matrix.cuda}}.base"
1125
tags:
@@ -32,20 +46,6 @@ steps:
3246
PYTHON_VERSION: "{{matrix.python}}"
3347
CUDA_VERSION: "{{matrix.cuda}}"
3448

35-
- name: raycpubase
36-
label: "wanda: ray.py{{matrix}}.cpu.base"
37-
tags:
38-
- python_dependencies
39-
- docker
40-
wanda: ci/docker/ray.cpu.base.wanda.yaml
41-
matrix:
42-
- "3.9"
43-
- "3.10"
44-
- "3.11"
45-
- "3.12"
46-
env:
47-
PYTHON_VERSION: "{{matrix}}"
48-
4949
- name: ray-llmbase
5050
label: "wanda: ray-llm.py{{matrix.python}}.cu{{matrix.cuda}}.base"
5151
tags:

‎WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
workspace(name = "com_github_ray_project_ray")
1+
workspace(name = "io_ray")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

‎bazel/gen_extract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def gen_extract(
1212
sub_dir: str = "python",
1313
):
1414
r = runfiles.Create()
15-
_repo_name = "com_github_ray_project_ray"
15+
_repo_name = "io_ray"
1616

1717
root_dir = os.environ.get("BUILD_WORKSPACE_DIRECTORY")
1818
if not root_dir:

‎bazel/jemalloc.BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@rules_foreign_cc//foreign_cc:configure.bzl", "configure_make")
2-
load("@com_github_ray_project_ray//bazel:ray.bzl", "filter_files_with_suffix")
2+
load("@io_ray//bazel:ray.bzl", "filter_files_with_suffix")
33

44
filegroup(
55
name = "all",

‎bazel/ray_deps_build_all.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
2-
load("@com_github_ray_project_ray//java:dependencies.bzl", "gen_java_deps")
2+
load("@io_ray//java:dependencies.bzl", "gen_java_deps")
33
load("@com_github_nelhage_rules_boost//:boost/boost.bzl", "boost_deps")
44
load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
55
load("@com_github_grpc_grpc//third_party/py:python_configure.bzl", "python_configure")

‎bazel/ray_deps_setup.bzl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def auto_http_archive(
5353

5454
# auto appending ray project namespace prefix for 3rd party library reusing.
5555
if build_file == True:
56-
build_file = "@com_github_ray_project_ray//%s:%s" % ("bazel", name + ".BUILD")
56+
build_file = "@io_ray//%s:%s" % ("bazel", name + ".BUILD")
5757

5858
if urls == True:
5959
prefer_url_over_mirrors = is_github
@@ -106,41 +106,41 @@ def ray_deps_setup():
106106
# all of http/git_repository should add prefix for patches defined in ray directory.
107107
auto_http_archive(
108108
name = "com_github_antirez_redis",
109-
build_file = "@com_github_ray_project_ray//bazel:redis.BUILD",
109+
build_file = "@io_ray//bazel:redis.BUILD",
110110
patch_args = ["-p1"],
111111
url = "https://github.com/redis/redis/archive/refs/tags/7.2.3.tar.gz",
112112
sha256 = "afd656dbc18a886f9a1cc08a550bf5eb89de0d431e713eba3ae243391fb008a6",
113113
patches = [
114-
"@com_github_ray_project_ray//thirdparty/patches:redis-quiet.patch",
114+
"@io_ray//thirdparty/patches:redis-quiet.patch",
115115
],
116116
workspace_file_content = 'workspace(name = "com_github_antirez_redis")',
117117
)
118118

119119
auto_http_archive(
120120
name = "com_github_redis_hiredis",
121-
build_file = "@com_github_ray_project_ray//bazel:hiredis.BUILD",
121+
build_file = "@io_ray//bazel:hiredis.BUILD",
122122
url = "https://github.com/redis/hiredis/archive/60e5075d4ac77424809f855ba3e398df7aacefe8.tar.gz",
123123
sha256 = "b6d6f799b7714d85316f9ebfb76a35a78744f42ea3b6774289d882d13a2f0383",
124124
patches = [
125-
"@com_github_ray_project_ray//thirdparty/patches:hiredis-windows-msvc.patch",
125+
"@io_ray//thirdparty/patches:hiredis-windows-msvc.patch",
126126
],
127127
)
128128

129129
auto_http_archive(
130130
name = "com_github_spdlog",
131-
build_file = "@com_github_ray_project_ray//bazel:spdlog.BUILD",
131+
build_file = "@io_ray//bazel:spdlog.BUILD",
132132
urls = ["https://github.com/gabime/spdlog/archive/v1.12.0.zip"],
133133
sha256 = "6174bf8885287422a6c6a0312eb8a30e8d22bcfcee7c48a6d02d1835d7769232",
134134
# spdlog rotation filename format conflict with ray, update the format.
135135
patches = [
136-
"@com_github_ray_project_ray//thirdparty/patches:spdlog-rotation-file-format.patch",
136+
"@io_ray//thirdparty/patches:spdlog-rotation-file-format.patch",
137137
],
138138
patch_args = ["-p1"],
139139
)
140140

141141
auto_http_archive(
142142
name = "com_github_tporadowski_redis_bin",
143-
build_file = "@com_github_ray_project_ray//bazel:redis.BUILD",
143+
build_file = "@io_ray//bazel:redis.BUILD",
144144
strip_prefix = None,
145145
url = "https://github.com/tporadowski/redis/releases/download/v5.0.9/Redis-x64-5.0.9.zip",
146146
sha256 = "b09565b22b50c505a5faa86a7e40b6683afb22f3c17c5e6a5e35fc9b7c03f4c2",
@@ -224,8 +224,8 @@ def ray_deps_setup():
224224
url = "https://github.com/census-instrumentation/opencensus-cpp/archive/5e5f2632c84e2230fb7ccb8e336f603d2ec6aa1b.zip",
225225
sha256 = "1b88d6663f05c6a56c1604eb2afad22831d5f28a76f6fab8f37187f1e4ace425",
226226
patches = [
227-
"@com_github_ray_project_ray//thirdparty/patches:opencensus-cpp-harvest-interval.patch",
228-
"@com_github_ray_project_ray//thirdparty/patches:opencensus-cpp-shutdown-api.patch",
227+
"@io_ray//thirdparty/patches:opencensus-cpp-harvest-interval.patch",
228+
"@io_ray//thirdparty/patches:opencensus-cpp-shutdown-api.patch",
229229
],
230230
patch_args = ["-p1"],
231231
)
@@ -263,11 +263,11 @@ def ray_deps_setup():
263263
url = "https://github.com/jupp0r/prometheus-cpp/archive/60eaa4ea47b16751a8e8740b05fe70914c68a480.tar.gz",
264264
sha256 = "ec825b802487ac18b0d98e2e8b7961487b12562f8f82e424521d0a891d9e1373",
265265
patches = [
266-
"@com_github_ray_project_ray//thirdparty/patches:prometheus-windows-headers.patch",
266+
"@io_ray//thirdparty/patches:prometheus-windows-headers.patch",
267267
# https://github.com/jupp0r/prometheus-cpp/pull/225
268-
"@com_github_ray_project_ray//thirdparty/patches:prometheus-windows-zlib.patch",
269-
"@com_github_ray_project_ray//thirdparty/patches:prometheus-windows-pollfd.patch",
270-
"@com_github_ray_project_ray//thirdparty/patches:prometheus-zlib-fdopen.patch",
268+
"@io_ray//thirdparty/patches:prometheus-windows-zlib.patch",
269+
"@io_ray//thirdparty/patches:prometheus-windows-pollfd.patch",
270+
"@io_ray//thirdparty/patches:prometheus-zlib-fdopen.patch",
271271
],
272272
)
273273

@@ -277,9 +277,9 @@ def ray_deps_setup():
277277
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.57.1.tar.gz",
278278
sha256 = "0762f809b9de845e6a7c809cabccad6aa4143479fd43b396611fe5a086c0aeeb",
279279
patches = [
280-
"@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch",
281-
"@com_github_ray_project_ray//thirdparty/patches:grpc-zlib-fdopen.patch",
282-
"@com_github_ray_project_ray//thirdparty/patches:grpc-configurable-thread-count.patch",
280+
"@io_ray//thirdparty/patches:grpc-cython-copts.patch",
281+
"@io_ray//thirdparty/patches:grpc-zlib-fdopen.patch",
282+
"@io_ray//thirdparty/patches:grpc-configurable-thread-count.patch",
283283
],
284284
)
285285

@@ -356,7 +356,7 @@ def ray_deps_setup():
356356
url = "https://github.com/msgpack/msgpack-c/archive/8085ab8721090a447cf98bb802d1406ad7afe420.tar.gz",
357357
sha256 = "83c37c9ad926bbee68d564d9f53c6cbb057c1f755c264043ddd87d89e36d15bb",
358358
patches = [
359-
"@com_github_ray_project_ray//thirdparty/patches:msgpack-windows-iovec.patch",
359+
"@io_ray//thirdparty/patches:msgpack-windows-iovec.patch",
360360
],
361361
)
362362

@@ -372,7 +372,7 @@ def ray_deps_setup():
372372
strip_prefix = "json-3.9.1",
373373
urls = ["https://github.com/nlohmann/json/archive/v3.9.1.tar.gz"],
374374
sha256 = "4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b",
375-
build_file = "@com_github_ray_project_ray//bazel:nlohmann_json.BUILD",
375+
build_file = "@io_ray//bazel:nlohmann_json.BUILD",
376376
)
377377

378378
auto_http_archive(
@@ -398,7 +398,7 @@ def ray_deps_setup():
398398
http_archive(
399399
name = "jemalloc",
400400
urls = ["https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"],
401-
build_file = "@com_github_ray_project_ray//bazel:jemalloc.BUILD",
401+
build_file = "@io_ray//bazel:jemalloc.BUILD",
402402
sha256 = "2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa",
403403
strip_prefix = "jemalloc-5.3.0",
404404
)

‎ci/build/build-manylinux-forge.sh

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
set -exuo pipefail
55

6+
BAZELISK_VERSION="v1.26.0"
7+
8+
platform="linux"
9+
10+
echo "Architecture(HOSTTYPE) is ${HOSTTYPE}"
11+
612
if [[ ! -e /usr/bin/nproc ]]; then
713
echo -e '#!/bin/bash\necho 10' > "/usr/bin/nproc"
814
chmod +x /usr/bin/nproc
@@ -33,12 +39,22 @@ nvm install "$NODE_VERSION"
3339
nvm use "$NODE_VERSION"
3440

3541
# Install bazel
36-
npm install -g @bazel/bazelisk
3742
mkdir -p "$HOME"/bin
38-
ln -sf "$(which bazelisk)" "$HOME"/bin/bazel
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
51+
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
3955

4056
# Use python3.9 as default python3
41-
ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
57+
sudo ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
4258

4359
{
4460
echo "build --config=ci"

‎ci/compile_llm_requirements.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ for CUDA_CODE in cpu cu121 cu128; do
1717
UV_PIP_COMPILE=(
1818
uv pip compile --generate-hashes --strip-extras
1919
--unsafe-package ray
20-
# The version we use on python 3.9 is not installable on python 3.11
21-
--unsafe-package grpcio-tools
2220
# setuptools should not be pinned.
2321
--unsafe-package setuptools
2422
--index-url "https://pypi.org/simple"

‎ci/docker/ray.cpu.base.aarch64.wanda.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ srcs:
66
build_args:
77
- PYTHON_VERSION
88
- BASE_IMAGE=ubuntu:22.04
9-
- HOSTTYPE=aarch64
109
tags:
1110
- cr.ray.io/rayproject/ray-py$PYTHON_VERSION-cpu-base-aarch64

‎ci/docker/ray.cuda.base.aarch64.wanda.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ srcs:
66
build_args:
77
- PYTHON_VERSION
88
- BASE_IMAGE=nvidia/cuda:$CUDA_VERSION-devel-ubuntu22.04
9-
- HOSTTYPE=aarch64
109
tags:
1110
- cr.ray.io/rayproject/ray-py$PYTHON_VERSION-cu$CUDA_VERSION-base-aarch64

0 commit comments

Comments
 (0)