Merge branch 'master' into can-event02

Author: sampan-s-nayak

.buildkite/_forge.rayci.yml

@@ -6,6 +6,20 @@ steps:
   - name: manylinux
     wanda: ci/docker/manylinux.wanda.yaml
 
+  - name: raycpubase
+    label: "wanda: ray.py{{matrix}}.cpu.base"
+    tags:
+      - python_dependencies
+      - docker
+    wanda: ci/docker/ray.cpu.base.wanda.yaml
+    matrix:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+    env:
+      PYTHON_VERSION: "{{matrix}}"
+
   - name: raycudabase
     label: "wanda: ray.py{{matrix.python}}.cu{{matrix.cuda}}.base"
     tags:
@@ -32,20 +46,6 @@ steps:
       PYTHON_VERSION: "{{matrix.python}}"
       CUDA_VERSION: "{{matrix.cuda}}"
 
-  - name: raycpubase
-    label: "wanda: ray.py{{matrix}}.cpu.base"
-    tags:
-      - python_dependencies
-      - docker
-    wanda: ci/docker/ray.cpu.base.wanda.yaml
-    matrix:
-      - "3.9"
-      - "3.10"
-      - "3.11"
-      - "3.12"
-    env:
-      PYTHON_VERSION: "{{matrix}}"
-
   - name: ray-llmbase
     label: "wanda: ray-llm.py{{matrix.python}}.cu{{matrix.cuda}}.base"
     tags:

WORKSPACE

@@ -1,4 +1,4 @@
-workspace(name = "com_github_ray_project_ray")
+workspace(name = "io_ray")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 

bazel/gen_extract.py

@@ -12,7 +12,7 @@ def gen_extract(
     sub_dir: str = "python",
 ):
     r = runfiles.Create()
-    _repo_name = "com_github_ray_project_ray"
+    _repo_name = "io_ray"
 
     root_dir = os.environ.get("BUILD_WORKSPACE_DIRECTORY")
     if not root_dir:

bazel/jemalloc.BUILD

@@ -1,5 +1,5 @@
 load("@rules_foreign_cc//foreign_cc:configure.bzl", "configure_make")
-load("@com_github_ray_project_ray//bazel:ray.bzl", "filter_files_with_suffix")
+load("@io_ray//bazel:ray.bzl", "filter_files_with_suffix")
 
 filegroup(
     name = "all",

bazel/ray_deps_build_all.bzl

@@ -1,5 +1,5 @@
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-load("@com_github_ray_project_ray//java:dependencies.bzl", "gen_java_deps")
+load("@io_ray//java:dependencies.bzl", "gen_java_deps")
 load("@com_github_nelhage_rules_boost//:boost/boost.bzl", "boost_deps")
 load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
 load("@com_github_grpc_grpc//third_party/py:python_configure.bzl", "python_configure")

bazel/ray_deps_setup.bzl

@@ -53,7 +53,7 @@ def auto_http_archive(
 
     # auto appending ray project namespace prefix for 3rd party library reusing.
     if build_file == True:
-        build_file = "@com_github_ray_project_ray//%s:%s" % ("bazel", name + ".BUILD")
+        build_file = "@io_ray//%s:%s" % ("bazel", name + ".BUILD")
 
     if urls == True:
         prefer_url_over_mirrors = is_github
@@ -106,41 +106,41 @@ def ray_deps_setup():
     # all of http/git_repository should add prefix for patches defined in ray directory.
     auto_http_archive(
         name = "com_github_antirez_redis",
-        build_file = "@com_github_ray_project_ray//bazel:redis.BUILD",
+        build_file = "@io_ray//bazel:redis.BUILD",
         patch_args = ["-p1"],
         url = "https://github.com/redis/redis/archive/refs/tags/7.2.3.tar.gz",
         sha256 = "afd656dbc18a886f9a1cc08a550bf5eb89de0d431e713eba3ae243391fb008a6",
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:redis-quiet.patch",
+            "@io_ray//thirdparty/patches:redis-quiet.patch",
         ],
         workspace_file_content = 'workspace(name = "com_github_antirez_redis")',
     )
 
     auto_http_archive(
         name = "com_github_redis_hiredis",
-        build_file = "@com_github_ray_project_ray//bazel:hiredis.BUILD",
+        build_file = "@io_ray//bazel:hiredis.BUILD",
         url = "https://github.com/redis/hiredis/archive/60e5075d4ac77424809f855ba3e398df7aacefe8.tar.gz",
         sha256 = "b6d6f799b7714d85316f9ebfb76a35a78744f42ea3b6774289d882d13a2f0383",
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:hiredis-windows-msvc.patch",
+            "@io_ray//thirdparty/patches:hiredis-windows-msvc.patch",
         ],
     )
 
     auto_http_archive(
         name = "com_github_spdlog",
-        build_file = "@com_github_ray_project_ray//bazel:spdlog.BUILD",
+        build_file = "@io_ray//bazel:spdlog.BUILD",
         urls = ["https://github.com/gabime/spdlog/archive/v1.12.0.zip"],
         sha256 = "6174bf8885287422a6c6a0312eb8a30e8d22bcfcee7c48a6d02d1835d7769232",
         # spdlog rotation filename format conflict with ray, update the format.
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:spdlog-rotation-file-format.patch",
+            "@io_ray//thirdparty/patches:spdlog-rotation-file-format.patch",
         ],
         patch_args = ["-p1"],
     )
 
     auto_http_archive(
         name = "com_github_tporadowski_redis_bin",
-        build_file = "@com_github_ray_project_ray//bazel:redis.BUILD",
+        build_file = "@io_ray//bazel:redis.BUILD",
         strip_prefix = None,
         url = "https://github.com/tporadowski/redis/releases/download/v5.0.9/Redis-x64-5.0.9.zip",
         sha256 = "b09565b22b50c505a5faa86a7e40b6683afb22f3c17c5e6a5e35fc9b7c03f4c2",
@@ -224,8 +224,8 @@ def ray_deps_setup():
         url = "https://github.com/census-instrumentation/opencensus-cpp/archive/5e5f2632c84e2230fb7ccb8e336f603d2ec6aa1b.zip",
         sha256 = "1b88d6663f05c6a56c1604eb2afad22831d5f28a76f6fab8f37187f1e4ace425",
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:opencensus-cpp-harvest-interval.patch",
-            "@com_github_ray_project_ray//thirdparty/patches:opencensus-cpp-shutdown-api.patch",
+            "@io_ray//thirdparty/patches:opencensus-cpp-harvest-interval.patch",
+            "@io_ray//thirdparty/patches:opencensus-cpp-shutdown-api.patch",
         ],
         patch_args = ["-p1"],
     )
@@ -263,11 +263,11 @@ def ray_deps_setup():
         url = "https://github.com/jupp0r/prometheus-cpp/archive/60eaa4ea47b16751a8e8740b05fe70914c68a480.tar.gz",
         sha256 = "ec825b802487ac18b0d98e2e8b7961487b12562f8f82e424521d0a891d9e1373",
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:prometheus-windows-headers.patch",
+            "@io_ray//thirdparty/patches:prometheus-windows-headers.patch",
             # https://github.com/jupp0r/prometheus-cpp/pull/225
-            "@com_github_ray_project_ray//thirdparty/patches:prometheus-windows-zlib.patch",
-            "@com_github_ray_project_ray//thirdparty/patches:prometheus-windows-pollfd.patch",
-            "@com_github_ray_project_ray//thirdparty/patches:prometheus-zlib-fdopen.patch",
+            "@io_ray//thirdparty/patches:prometheus-windows-zlib.patch",
+            "@io_ray//thirdparty/patches:prometheus-windows-pollfd.patch",
+            "@io_ray//thirdparty/patches:prometheus-zlib-fdopen.patch",
         ],
     )
 
@@ -277,9 +277,9 @@ def ray_deps_setup():
         url = "https://github.com/grpc/grpc/archive/refs/tags/v1.57.1.tar.gz",
         sha256 = "0762f809b9de845e6a7c809cabccad6aa4143479fd43b396611fe5a086c0aeeb",
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:grpc-cython-copts.patch",
-            "@com_github_ray_project_ray//thirdparty/patches:grpc-zlib-fdopen.patch",
-            "@com_github_ray_project_ray//thirdparty/patches:grpc-configurable-thread-count.patch",
+            "@io_ray//thirdparty/patches:grpc-cython-copts.patch",
+            "@io_ray//thirdparty/patches:grpc-zlib-fdopen.patch",
+            "@io_ray//thirdparty/patches:grpc-configurable-thread-count.patch",
         ],
     )
 
@@ -356,7 +356,7 @@ def ray_deps_setup():
         url = "https://github.com/msgpack/msgpack-c/archive/8085ab8721090a447cf98bb802d1406ad7afe420.tar.gz",
         sha256 = "83c37c9ad926bbee68d564d9f53c6cbb057c1f755c264043ddd87d89e36d15bb",
         patches = [
-            "@com_github_ray_project_ray//thirdparty/patches:msgpack-windows-iovec.patch",
+            "@io_ray//thirdparty/patches:msgpack-windows-iovec.patch",
         ],
     )
 
@@ -372,7 +372,7 @@ def ray_deps_setup():
         strip_prefix = "json-3.9.1",
         urls = ["https://github.com/nlohmann/json/archive/v3.9.1.tar.gz"],
         sha256 = "4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b",
-        build_file = "@com_github_ray_project_ray//bazel:nlohmann_json.BUILD",
+        build_file = "@io_ray//bazel:nlohmann_json.BUILD",
     )
 
     auto_http_archive(
@@ -398,7 +398,7 @@ def ray_deps_setup():
     http_archive(
         name = "jemalloc",
         urls = ["https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"],
-        build_file = "@com_github_ray_project_ray//bazel:jemalloc.BUILD",
+        build_file = "@io_ray//bazel:jemalloc.BUILD",
         sha256 = "2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa",
         strip_prefix = "jemalloc-5.3.0",
     )

ci/build/build-manylinux-forge.sh

@@ -3,6 +3,12 @@
 
 set -exuo pipefail
 
+BAZELISK_VERSION="v1.26.0"
+
+platform="linux"
+
+echo "Architecture(HOSTTYPE) is ${HOSTTYPE}"
+
 if [[ ! -e /usr/bin/nproc ]]; then
   echo -e '#!/bin/bash\necho 10' > "/usr/bin/nproc"
   chmod +x /usr/bin/nproc
@@ -33,12 +39,22 @@ nvm install "$NODE_VERSION"
 nvm use "$NODE_VERSION"
 
 # Install bazel
-npm install -g @bazel/bazelisk
 mkdir -p "$HOME"/bin
-ln -sf "$(which bazelisk)" "$HOME"/bin/bazel
+if [[ "${HOSTTYPE}" == "aarch64" || "${HOSTTYPE}" = "arm64" ]]; then
+  # architecture is "aarch64", but the bazel tag is "arm64"
+  BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${platform}-arm64"
+elif [[ "${HOSTTYPE}" == "x86_64" ]]; then
+  BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${platform}-amd64"
+else
+  echo "Could not found matching bazelisk URL for platform ${platform} and architecture ${HOSTTYPE}"
+  exit 1
+fi
+curl -sSfL -o "$HOME"/bin/bazelisk "${BAZELISK_URL}"
+chmod +x "$HOME"/bin/bazelisk
+sudo ln -sf "$HOME"/bin/bazelisk /usr/local/bin/bazel
 
 # Use python3.9 as default python3
-ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
+sudo ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
 
 {
   echo "build --config=ci"

ci/compile_llm_requirements.sh

@@ -17,8 +17,6 @@ for CUDA_CODE in cpu cu121 cu128; do
 	UV_PIP_COMPILE=(
 		uv pip compile --generate-hashes --strip-extras
 		--unsafe-package ray
-		# The version we use on python 3.9 is not installable on python 3.11
-		--unsafe-package grpcio-tools
 		# setuptools should not be pinned.
 		--unsafe-package setuptools
 		--index-url "https://pypi.org/simple"

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

@@ -6,6 +6,5 @@ srcs:
 build_args:
   - PYTHON_VERSION
   - BASE_IMAGE=ubuntu:22.04
-  - HOSTTYPE=aarch64
 tags:
   - cr.ray.io/rayproject/ray-py$PYTHON_VERSION-cpu-base-aarch64

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

@@ -6,6 +6,5 @@ srcs:
 build_args:
   - PYTHON_VERSION
   - BASE_IMAGE=nvidia/cuda:$CUDA_VERSION-devel-ubuntu22.04
-  - HOSTTYPE=aarch64
 tags:
   - cr.ray.io/rayproject/ray-py$PYTHON_VERSION-cu$CUDA_VERSION-base-aarch64