Skip to content

Commit 8d1057a

Browse files
andrew-anyscaleandrew-anyscale
committed
Add wanda cpp wheel builds (x86_64)
This adds wanda-based builds for ray C++ API wheels for x86_64. Changes: - Add ray-cpp-core.wanda.yaml and Dockerfile for cpp core - Add ray-cpp-wheel.wanda.yaml for cpp wheel builds - Update build.rayci.yml with cpp wheel build and upload steps Topic: ray-cpp-wheel Relative: ray-wheel Labels: draft Signed-off-by: andrew <[email protected]>
1 parent 32347fa commit 8d1057a

File tree

7 files changed

+287
-18
lines changed

7 files changed

+287
-18
lines changed

‎.buildkite/build.rayci.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,64 @@ steps:
7676
- skip-on-premerge
7777
- oss
7878

79+
- name: ray-cpp-core-build
80+
label: "wanda: cpp core py{{matrix}} (x86_64)"
81+
wanda: ci/docker/ray-cpp-core.wanda.yaml
82+
matrix:
83+
- "3.10"
84+
- "3.11"
85+
- "3.12"
86+
env:
87+
PYTHON_VERSION: "{{matrix}}"
88+
ARCH_SUFFIX: ""
89+
HOSTTYPE: "x86_64"
90+
MANYLINUX_VERSION: "260103.868e54c"
91+
tags:
92+
- release_wheels
93+
- oss
94+
95+
- name: ray-cpp-wheel-build
96+
label: "wanda: cpp wheel py{{matrix}} (x86_64)"
97+
wanda: ci/docker/ray-cpp-wheel.wanda.yaml
98+
matrix:
99+
- "3.10"
100+
- "3.11"
101+
- "3.12"
102+
- "3.13"
103+
env:
104+
PYTHON_VERSION: "{{matrix}}"
105+
ARCH_SUFFIX: ""
106+
HOSTTYPE: "x86_64"
107+
MANYLINUX_VERSION: "260103.868e54c"
108+
tags:
109+
- release_wheels
110+
- linux_wheels
111+
- oss
112+
depends_on:
113+
- ray-core-build
114+
- ray-cpp-core-build
115+
- ray-java-build
116+
- ray-dashboard-build
117+
118+
# Upload cpp wheels to S3
119+
- label: ":s3: upload: cpp wheel py{{matrix}} (x86_64)"
120+
key: linux_cpp_wheels_upload
121+
instance_type: small
122+
commands:
123+
- ./ci/build/extract_wanda_wheels.sh ray-cpp-wheel-py{{matrix}}
124+
- ./ci/build/copy_build_artifacts.sh wheel
125+
matrix:
126+
- "3.10"
127+
- "3.11"
128+
- "3.12"
129+
- "3.13"
130+
depends_on:
131+
- ray-cpp-wheel-build
132+
tags:
133+
- release_wheels
134+
- skip-on-premerge
135+
- oss
136+
79137
- label: ":tapioca: build: jar"
80138
key: java_wheels
81139
tags:

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ set -exuo pipefail
44
PYTHON="$1"
55
TRAVIS_COMMIT="${TRAVIS_COMMIT:-$BUILDKITE_COMMIT}"
66

7+
# WHEEL_TYPE controls which wheel(s) to build:
8+
# ray - build only ray wheel (default)
9+
# cpp - build only ray-cpp wheel
10+
# both - build both wheels
11+
WHEEL_TYPE="${WHEEL_TYPE:-ray}"
12+
713
export RAY_BUILD_ENV="manylinux_py${PYTHON}"
814

915
mkdir -p .whl
@@ -26,13 +32,15 @@ export BAZEL_PATH="$HOME"/bin/bazel
2632
# This is required for building with bazel.
2733
sudo ln -sf "/opt/python/${PYTHON}/bin/python3" /usr/local/bin/python3
2834

29-
# build ray wheel
30-
PATH="/opt/python/${PYTHON}/bin:$PATH" RAY_INSTALL_JAVA=0 \
31-
"/opt/python/${PYTHON}/bin/python" -m pip wheel -v -w dist . --no-deps
32-
35+
# Build wheel(s) based on WHEEL_TYPE
36+
if [[ "$WHEEL_TYPE" == "ray" || "$WHEEL_TYPE" == "both" ]]; then
37+
echo "Building ray wheel..."
38+
PATH="/opt/python/${PYTHON}/bin:$PATH" RAY_INSTALL_JAVA=0 \
39+
"/opt/python/${PYTHON}/bin/python" -m pip wheel -v -w dist . --no-deps
40+
fi
3341

34-
if [[ "${RAY_DISABLE_EXTRA_CPP:-}" != 1 ]]; then
35-
# build ray-cpp wheel
42+
if [[ "$WHEEL_TYPE" == "cpp" || "$WHEEL_TYPE" == "both" ]]; then
43+
echo "Building ray-cpp wheel..."
3644
PATH="/opt/python/${PYTHON}/bin:$PATH" RAY_INSTALL_JAVA=0 \
3745
RAY_INSTALL_CPP=1 "/opt/python/${PYTHON}/bin/python" -m pip wheel -v -w dist . --no-deps
3846
fi

‎ci/docker/ray-cpp-core.Dockerfile‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# syntax=docker/dockerfile:1.3-labs
2+
#
3+
# Ray C++ Core Artifacts Builder
4+
# ==============================
5+
# Builds ray_cpp_pkg.zip containing C++ headers, libraries, and examples.
6+
#
7+
ARG ARCH_SUFFIX=
8+
ARG HOSTTYPE=x86_64
9+
ARG MANYLINUX_VERSION
10+
FROM rayproject/manylinux2014:${MANYLINUX_VERSION}-jdk-${HOSTTYPE} AS builder
11+
12+
ARG PYTHON_VERSION=3.10
13+
ARG BUILDKITE_BAZEL_CACHE_URL
14+
ARG BUILDKITE_CACHE_READONLY
15+
ARG HOSTTYPE
16+
17+
WORKDIR /home/forge/ray
18+
19+
COPY . .
20+
21+
# Mounting cache dir for faster local rebuilds (architecture-specific to avoid toolchain conflicts)
22+
RUN --mount=type=cache,target=/home/forge/.cache,uid=2000,gid=100,id=bazel-cache-${HOSTTYPE}-${PYTHON_VERSION} \
23+
<<'EOF'
24+
#!/bin/bash
25+
set -euo pipefail
26+
27+
PY_CODE="${PYTHON_VERSION//./}"
28+
PY_BIN="cp${PY_CODE}-cp${PY_CODE}"
29+
export RAY_BUILD_ENV="manylinux_py${PY_BIN}"
30+
31+
sudo ln -sf "/opt/python/${PY_BIN}/bin/python3" /usr/local/bin/python3
32+
sudo ln -sf /usr/local/bin/python3 /usr/local/bin/python
33+
34+
if [[ "${BUILDKITE_CACHE_READONLY:-}" == "true" ]]; then
35+
echo "build --remote_upload_local_results=false" >> "$HOME/.bazelrc"
36+
fi
37+
38+
echo "build --repository_cache=/home/forge/.cache/bazel-repo" >> "$HOME/.bazelrc"
39+
40+
bazelisk build --config=ci //cpp:ray_cpp_pkg_zip
41+
42+
cp bazel-bin/cpp/ray_cpp_pkg.zip /home/forge/ray_cpp_pkg.zip
43+
44+
EOF
45+
46+
FROM scratch
47+
48+
COPY --from=builder /home/forge/ray_cpp_pkg.zip /

‎ci/docker/ray-cpp-core.wanda.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: "ray-cpp-core-py$PYTHON_VERSION$ARCH_SUFFIX"
2+
froms: ["rayproject/manylinux2014:$MANYLINUX_VERSION-jdk-$HOSTTYPE"]
3+
dockerfile: ci/docker/ray-cpp-core.Dockerfile
4+
srcs:
5+
- .bazelversion
6+
- .bazelrc
7+
- WORKSPACE
8+
- BUILD.bazel
9+
- bazel/
10+
- thirdparty/
11+
- src/
12+
- cpp/
13+
- python/ray/__init__.py
14+
- python/ray/_raylet.pxd
15+
- python/ray/_raylet.pyi
16+
- python/ray/_raylet.pyx
17+
- python/ray/includes/
18+
- java/BUILD.bazel
19+
- java/dependencies.bzl
20+
- release/BUILD.bazel
21+
- release/requirements.txt
22+
- release/requirements_py310.txt
23+
build_args:
24+
- PYTHON_VERSION
25+
- ARCH_SUFFIX
26+
- HOSTTYPE
27+
- MANYLINUX_VERSION
28+
- BUILDKITE_BAZEL_CACHE_URL
29+
build_hint_args:
30+
- BUILDKITE_CACHE_READONLY

‎ci/docker/ray-cpp-wheel.Dockerfile‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# syntax=docker/dockerfile:1.3-labs
2+
#
3+
# Ray C++ Wheel Builder
4+
# =====================
5+
# Builds manylinux2014-compatible ray-cpp wheel using pre-built C++ artifacts from wanda cache.
6+
#
7+
# This is a minimal Dockerfile for ray-cpp wheel builds only.
8+
# It copies only the files needed for the cpp wheel, reducing build context size.
9+
10+
ARG RAY_CORE_IMAGE
11+
ARG RAY_CPP_CORE_IMAGE
12+
ARG RAY_JAVA_IMAGE
13+
ARG RAY_DASHBOARD_IMAGE
14+
ARG MANYLINUX_VERSION
15+
ARG HOSTTYPE
16+
17+
FROM ${RAY_CORE_IMAGE} AS ray-core
18+
FROM ${RAY_CPP_CORE_IMAGE} AS ray-cpp-core
19+
FROM ${RAY_JAVA_IMAGE} AS ray-java
20+
FROM ${RAY_DASHBOARD_IMAGE} AS ray-dashboard
21+
22+
# Main build stage - manylinux2014 provides GLIBC 2.17
23+
FROM rayproject/manylinux2014:${MANYLINUX_VERSION}-jdk-${HOSTTYPE} AS builder
24+
25+
ARG PYTHON_VERSION=3.10
26+
ARG BUILDKITE_COMMIT
27+
28+
# Set environment variables for the build
29+
ENV BUILDKITE_COMMIT=${BUILDKITE_COMMIT:-unknown} \
30+
PYTHON_VERSION=${PYTHON_VERSION} \
31+
SKIP_BAZEL_BUILD=1 \
32+
WHEEL_TYPE=cpp
33+
34+
WORKDIR /home/forge/ray
35+
36+
# Copy artifacts from all stages
37+
COPY --from=ray-core /ray_pkg.zip /tmp/
38+
COPY --from=ray-core /ray_py_proto.zip /tmp/
39+
COPY --from=ray-java /ray_java_pkg.zip /tmp/
40+
COPY --from=ray-dashboard /dashboard.tar.gz /tmp/
41+
42+
# Minimal source files needed for cpp wheel build
43+
COPY --chown=2000:100 ci/build/build-manylinux-wheel.sh ci/build/
44+
COPY --chown=2000:100 README.rst pyproject.toml ./
45+
COPY --chown=2000:100 python/setup.py python/
46+
COPY --chown=2000:100 python/LICENSE.txt python/
47+
COPY --chown=2000:100 python/MANIFEST.in python/
48+
COPY --chown=2000:100 python/ray/_version.py python/ray/
49+
50+
USER forge
51+
RUN --mount=from=ray-cpp-core,source=/,target=/ray-cpp-core,ro \
52+
<<'EOF'
53+
#!/bin/bash
54+
set -euo pipefail
55+
56+
PY_VERSION="${PYTHON_VERSION//./}"
57+
PY_BIN="cp${PY_VERSION}-cp${PY_VERSION}"
58+
59+
# Verify required artifacts exist before unpacking
60+
for f in /tmp/ray_pkg.zip /tmp/ray_py_proto.zip /tmp/ray_java_pkg.zip /tmp/dashboard.tar.gz; do
61+
[[ -f "$f" ]] || { echo "ERROR: missing artifact: $f"; exit 1; }
62+
done
63+
64+
# Verify cpp core artifacts exist
65+
if [[ ! -f /ray-cpp-core/ray_cpp_pkg.zip ]]; then
66+
echo "ERROR: ray_cpp_pkg.zip not found - required for cpp wheel build"
67+
exit 1
68+
fi
69+
70+
# Clean extraction dirs to avoid stale leftovers
71+
rm -rf /tmp/ray_pkg /tmp/ray_java_pkg /tmp/ray_cpp_pkg
72+
mkdir -p /tmp/ray_pkg /tmp/ray_java_pkg /tmp/ray_cpp_pkg
73+
74+
# Unpack pre-built artifacts
75+
unzip -o /tmp/ray_pkg.zip -d /tmp/ray_pkg
76+
unzip -o /tmp/ray_py_proto.zip -d python/
77+
unzip -o /tmp/ray_java_pkg.zip -d /tmp/ray_java_pkg
78+
mkdir -p python/ray/dashboard/client/build
79+
tar -xzf /tmp/dashboard.tar.gz -C python/ray/dashboard/client/build/
80+
81+
# C++ core artifacts
82+
cp -r /tmp/ray_pkg/ray/* python/ray/
83+
84+
# Java JARs
85+
cp -r /tmp/ray_java_pkg/ray/* python/ray/
86+
87+
# C++ API artifacts (headers, libs, examples)
88+
unzip -o /ray-cpp-core/ray_cpp_pkg.zip -d /tmp/ray_cpp_pkg
89+
cp -r /tmp/ray_cpp_pkg/ray/cpp python/ray/
90+
91+
# Build cpp wheel
92+
export WHEEL_TYPE=cpp
93+
./ci/build/build-manylinux-wheel.sh "$PY_BIN"
94+
95+
# Sanity check: ensure wheels exist
96+
shopt -s nullglob
97+
wheels=(.whl/*.whl)
98+
if (( ${#wheels[@]} == 0 )); then
99+
echo "ERROR: No wheels produced in .whl/"
100+
ls -la .whl || true
101+
exit 1
102+
fi
103+
104+
EOF
105+
106+
FROM scratch
107+
COPY --from=builder /home/forge/ray/.whl/*.whl /

‎ci/docker/ray-cpp-wheel.wanda.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "ray-cpp-wheel-py$PYTHON_VERSION$ARCH_SUFFIX"
2+
disable_caching: true
3+
froms:
4+
- "rayproject/manylinux2014:$MANYLINUX_VERSION-jdk-$HOSTTYPE"
5+
- "cr.ray.io/rayproject/ray-core-py$PYTHON_VERSION$ARCH_SUFFIX" # C++ binaries (ray_pkg.zip)
6+
- "cr.ray.io/rayproject/ray-cpp-core-py$PYTHON_VERSION$ARCH_SUFFIX" # C++ headers/libs (ray_cpp_pkg.zip)
7+
- "cr.ray.io/rayproject/ray-java-build$ARCH_SUFFIX" # Java JARs
8+
- "cr.ray.io/rayproject/ray-dashboard" # Dashboard
9+
dockerfile: ci/docker/ray-cpp-wheel.Dockerfile
10+
srcs:
11+
- pyproject.toml
12+
- README.rst
13+
- ci/build/build-manylinux-wheel.sh
14+
- python/setup.py
15+
- python/LICENSE.txt
16+
- python/MANIFEST.in
17+
- python/ray/_version.py
18+
build_args:
19+
- PYTHON_VERSION
20+
- MANYLINUX_VERSION
21+
- HOSTTYPE
22+
- BUILDKITE_COMMIT
23+
- ARCH_SUFFIX
24+
- RAY_CORE_IMAGE=cr.ray.io/rayproject/ray-core-py$PYTHON_VERSION$ARCH_SUFFIX
25+
- RAY_CPP_CORE_IMAGE=cr.ray.io/rayproject/ray-cpp-core-py$PYTHON_VERSION$ARCH_SUFFIX
26+
- RAY_JAVA_IMAGE=cr.ray.io/rayproject/ray-java-build$ARCH_SUFFIX
27+
- RAY_DASHBOARD_IMAGE=cr.ray.io/rayproject/ray-dashboard

‎ci/docker/ray-wheel.Dockerfile‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ ARG WHEEL_TYPE=ray
3636
# Set environment variables for the build
3737
# - BUILDKITE_COMMIT: Used for ray.__commit__. Defaults to "unknown" for local builds.
3838
# - SKIP_BAZEL_BUILD=1: Skip bazel build, use pre-built artifacts from ray-core/ray-java/ray-dashboard
39-
# - RAY_DISABLE_EXTRA_CPP: 1 for ray wheel only, 0 for ray-cpp wheel
40-
# - WHEEL_TYPE: "ray" or "cpp" - determines which wheel to build
39+
# - WHEEL_TYPE: "ray", "cpp", or "both" - determines which wheel(s) to build
4140
ENV BUILDKITE_COMMIT=${BUILDKITE_COMMIT:-unknown} \
4241
PYTHON_VERSION=${PYTHON_VERSION} \
4342
SKIP_BAZEL_BUILD=1 \
@@ -100,20 +99,12 @@ if [[ "$WHEEL_TYPE" == "cpp" ]]; then
10099
echo "ERROR: ray_cpp_pkg.zip not found for cpp wheel build"
101100
exit 1
102101
fi
103-
export RAY_DISABLE_EXTRA_CPP=0
104-
else
105-
export RAY_DISABLE_EXTRA_CPP=1
106102
fi
107103

108-
# Build wheels
104+
# Build wheel(s) - WHEEL_TYPE controls which wheel is built (ray, cpp, or both)
105+
export WHEEL_TYPE
109106
./ci/build/build-manylinux-wheel.sh "$PY_BIN"
110107

111-
# Filter output based on wheel type
112-
if [[ "$WHEEL_TYPE" == "cpp" ]]; then
113-
# Keep only ray-cpp wheel
114-
rm -f .whl/ray-[0-9]*.whl
115-
fi
116-
117108
# Sanity check: ensure wheels exist
118109
shopt -s nullglob
119110
wheels=(.whl/*.whl)

0 commit comments

Comments
 (0)