diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3877736d..7b5f5a0b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-13 + vmImage: macOS-15 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index d4595492..0a133563 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -22,6 +22,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 07b3d6e9..cf1db5d6 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -22,6 +22,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index b68cfd0d..202705ec 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -22,6 +22,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml index 2e146866..2a0dfde0 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -22,6 +22,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index f27b0cd6..7209862f 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 77537506..c7a48f6b 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index c595fdc1..09c1b92e 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 31b75a47..fcf134ed 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 864aeb6a..f82aa8a5 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index b7619741..cf5476d7 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index e1dfd8cb..2418a192 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index 46a42e16..2313ceee 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -22,6 +22,8 @@ cxx_compiler_version: - '19' github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' macos_machine: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index a43e2ad5..dd1de344 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler: - vs2022 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index d8bb2d99..637d8384 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler: - vs2022 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 096f65f3..3fffc281 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler: - vs2022 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/.ci_support/win_64_python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml index 8f1e4ef1..1869d1f7 100644 --- a/.ci_support/win_64_python3.13.____cp313.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -12,6 +12,8 @@ cxx_compiler: - vs2022 github_actions_labels: - cirun-openstack-cpu-4xlarge +libboost_devel: +- '1.86' libgrpc: - '1.71' pin_run_as_build: diff --git a/README.md b/README.md index 7c6cbf22..0a2d5ae9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About ray-air-feedstock ======================= -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/ray-packages-feedstock2-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/ray-packages-feedstock/blob/main/LICENSE.txt) Home: https://github.com/ray-project/ray @@ -30,8 +30,8 @@ Current build status
- - + + @@ -39,22 +39,22 @@ Current build status @@ -67,22 +67,22 @@ Current build status @@ -95,22 +95,22 @@ Current build status @@ -123,22 +123,22 @@ Current build status diff --git a/pixi.toml b/pixi.toml index 2d6a609d..45d1254d 100644 --- a/pixi.toml +++ b/pixi.toml @@ -6,10 +6,10 @@ "$schema" = "https://pixi.sh/v0.36.0/schema/manifest/schema.json" [project] -name = "ray-packages-feedstock2" -version = "3.52.0" # conda-smithy version used to generate this file -description = "Pixi configuration for conda-forge/ray-packages-feedstock2" -authors = ["@conda-forge/ray-packages-"] +name = "ray-packages-feedstock" +version = "3.52.1" # conda-smithy version used to generate this file +description = "Pixi configuration for conda-forge/ray-packages-feedstock" +authors = ["@conda-forge/ray-packages"] channels = ["conda-forge"] platforms = ["linux-64", "osx-64", "win-64"] @@ -24,79 +24,103 @@ cmd = "inspect_artifacts --all-packages" description = "List contents of all packages found in rattler-build build directory." [tasks.build] cmd = "rattler-build build --recipe recipe" -description = "Build ray-packages-feedstock2 directly (without setup scripts), no particular variant specified" +description = "Build ray-packages-feedstock directly (without setup scripts), no particular variant specified" [tasks."build-linux_64_python3.10.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/linux_64_python3.10.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant linux_64_python3.10.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant linux_64_python3.10.____cpython directly (without setup scripts)" [tasks."inspect-linux_64_python3.10.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_python3.10.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant linux_64_python3.10.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant linux_64_python3.10.____cpython" [tasks."build-linux_64_python3.11.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/linux_64_python3.11.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant linux_64_python3.11.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant linux_64_python3.11.____cpython directly (without setup scripts)" [tasks."inspect-linux_64_python3.11.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_python3.11.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant linux_64_python3.11.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant linux_64_python3.11.____cpython" [tasks."build-linux_64_python3.12.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/linux_64_python3.12.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant linux_64_python3.12.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant linux_64_python3.12.____cpython directly (without setup scripts)" [tasks."inspect-linux_64_python3.12.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_python3.12.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant linux_64_python3.12.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant linux_64_python3.12.____cpython" +[tasks."build-linux_64_python3.13.____cp313"] +cmd = "rattler-build build --recipe recipe -m .ci_support/linux_64_python3.13.____cp313.yaml" +description = "Build ray-packages-feedstock with variant linux_64_python3.13.____cp313 directly (without setup scripts)" +[tasks."inspect-linux_64_python3.13.____cp313"] +cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_python3.13.____cp313.yaml" +description = "List contents of ray-packages-feedstock packages built for variant linux_64_python3.13.____cp313" [tasks."build-osx_64_python3.10.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.10.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant osx_64_python3.10.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant osx_64_python3.10.____cpython directly (without setup scripts)" [tasks."inspect-osx_64_python3.10.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.10.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant osx_64_python3.10.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant osx_64_python3.10.____cpython" [tasks."build-osx_64_python3.11.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.11.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant osx_64_python3.11.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant osx_64_python3.11.____cpython directly (without setup scripts)" [tasks."inspect-osx_64_python3.11.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.11.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant osx_64_python3.11.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant osx_64_python3.11.____cpython" [tasks."build-osx_64_python3.12.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.12.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant osx_64_python3.12.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant osx_64_python3.12.____cpython directly (without setup scripts)" [tasks."inspect-osx_64_python3.12.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.12.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant osx_64_python3.12.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant osx_64_python3.12.____cpython" +[tasks."build-osx_64_python3.13.____cp313"] +cmd = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.13.____cp313.yaml" +description = "Build ray-packages-feedstock with variant osx_64_python3.13.____cp313 directly (without setup scripts)" +[tasks."inspect-osx_64_python3.13.____cp313"] +cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.13.____cp313.yaml" +description = "List contents of ray-packages-feedstock packages built for variant osx_64_python3.13.____cp313" [tasks."build-osx_arm64_python3.10.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.10.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant osx_arm64_python3.10.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant osx_arm64_python3.10.____cpython directly (without setup scripts)" [tasks."inspect-osx_arm64_python3.10.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.10.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant osx_arm64_python3.10.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant osx_arm64_python3.10.____cpython" [tasks."build-osx_arm64_python3.11.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.11.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant osx_arm64_python3.11.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant osx_arm64_python3.11.____cpython directly (without setup scripts)" [tasks."inspect-osx_arm64_python3.11.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.11.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant osx_arm64_python3.11.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant osx_arm64_python3.11.____cpython" [tasks."build-osx_arm64_python3.12.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.12.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant osx_arm64_python3.12.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant osx_arm64_python3.12.____cpython directly (without setup scripts)" [tasks."inspect-osx_arm64_python3.12.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.12.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant osx_arm64_python3.12.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant osx_arm64_python3.12.____cpython" +[tasks."build-osx_arm64_python3.13.____cp313"] +cmd = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.13.____cp313.yaml" +description = "Build ray-packages-feedstock with variant osx_arm64_python3.13.____cp313 directly (without setup scripts)" +[tasks."inspect-osx_arm64_python3.13.____cp313"] +cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.13.____cp313.yaml" +description = "List contents of ray-packages-feedstock packages built for variant osx_arm64_python3.13.____cp313" [tasks."build-win_64_python3.10.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/win_64_python3.10.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant win_64_python3.10.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant win_64_python3.10.____cpython directly (without setup scripts)" [tasks."inspect-win_64_python3.10.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/win_64_python3.10.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant win_64_python3.10.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant win_64_python3.10.____cpython" [tasks."build-win_64_python3.11.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/win_64_python3.11.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant win_64_python3.11.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant win_64_python3.11.____cpython directly (without setup scripts)" [tasks."inspect-win_64_python3.11.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/win_64_python3.11.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant win_64_python3.11.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant win_64_python3.11.____cpython" [tasks."build-win_64_python3.12.____cpython"] cmd = "rattler-build build --recipe recipe -m .ci_support/win_64_python3.12.____cpython.yaml" -description = "Build ray-packages-feedstock2 with variant win_64_python3.12.____cpython directly (without setup scripts)" +description = "Build ray-packages-feedstock with variant win_64_python3.12.____cpython directly (without setup scripts)" [tasks."inspect-win_64_python3.12.____cpython"] cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/win_64_python3.12.____cpython.yaml" -description = "List contents of ray-packages-feedstock2 packages built for variant win_64_python3.12.____cpython" +description = "List contents of ray-packages-feedstock packages built for variant win_64_python3.12.____cpython" +[tasks."build-win_64_python3.13.____cp313"] +cmd = "rattler-build build --recipe recipe -m .ci_support/win_64_python3.13.____cp313.yaml" +description = "Build ray-packages-feedstock with variant win_64_python3.13.____cp313 directly (without setup scripts)" +[tasks."inspect-win_64_python3.13.____cp313"] +cmd = "inspect_artifacts --recipe-dir recipe -m .ci_support/win_64_python3.13.____cp313.yaml" +description = "List contents of ray-packages-feedstock packages built for variant win_64_python3.13.____cp313" [feature.smithy.dependencies] conda-smithy = "*" diff --git a/recipe/build-core.bat b/recipe/build-core.bat index e4f5f522..9d2f76b4 100644 --- a/recipe/build-core.bat +++ b/recipe/build-core.bat @@ -3,36 +3,20 @@ set SKIP_THIRDPARTY_INSTALL_CONDA_FORGE=1 set IS_AUTOMATED_BUILD=1 set "BAZEL_SH=%BUILD_PREFIX%\Library\usr\bin\bash.exe" +mkdir thirdparty\systemlibs +robocopy /E %RECIPE_DIR%\systemlibs thirdparty\systemlibs + echo ========================================================== echo try to work around https://github.com/bazelbuild/bazel/issues/18592 echo ========================================================== set BAZEL_VC=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC -echo dir %BAZEL_VC% -dir "%BAZEL_VC%" -echo ---------- rmdir /q /s "%BAZEL_VC%\vcpkg" -echo ---------- -echo dir %BAZEL_VC% -dir "%BAZEL_VC%" -echo ---------- - -echo check git -echo ---------- -where git -dir %CONDA_PREFIX%\Library\bin /w -echo ---------- -git --version -echo ---------- -echo %CONDA_PREFIX% -python -c "import os; print('\n'.join(os.environ['PATH'].split(';')))" -echo ---------- echo ========================================================== echo calling pip to install echo ========================================================== cd python echo startup --output_user_root=D:/tmp >> ..\.bazelrc -echo build --jobs=1 >> ..\.bazelrc rem echo build --subcommands=pretty_print >> ..\.bazelrc "%PYTHON%" -m pip install . -vv --no-deps --no-build-isolation diff --git a/recipe/build-core.sh b/recipe/build-core.sh index 6863ea18..b055939c 100644 --- a/recipe/build-core.sh +++ b/recipe/build-core.sh @@ -2,9 +2,6 @@ set -xe if [[ "$target_platform" == osx* ]]; then - # make sure the vendored redis OSX build can find the correct toolchain. the SDKROOT is - # also passed as we are using at least OSX 10.15 which moves the include directory out - # of /usr/include to ${SDKROOT}/MacOSX.sdk/usr/include if [[ "$target_platform" == osx-arm64 ]]; then export LDFLAGS="$LDFLAGS -undefined dynamic_lookup -Wl,-framework,Foundation" else @@ -13,8 +10,6 @@ if [[ "$target_platform" == osx* ]]; then # https://github.com/conda-forge/bazel-toolchain-feedstock/issues/18 # delete the line from the template and the CXXFLAGS export CXXFLAGS="${CXXFLAGS/-stdlib=libc++ /} -Wno-vla-cxx-extension" - # Exchange the short exe name for the full path, used in - # # bazel_toolchain/cc_wrapper.sh sed -i"''" -e'/stdlib=libc/d' $CONDA_PREFIX/share/bazel_toolchain/CROSSTOOL.template source gen-bazel-toolchain cat >> .bazelrc < +Date: Tue, 2 Sep 2025 06:30:02 -0500 +Subject: [PATCH 1/2] Add ray_systemlibs + +--- + WORKSPACE | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/WORKSPACE b/WORKSPACE +index e56c6a109b..b4cbb29097 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -28,6 +28,10 @@ load("//bazel:ray_deps_setup.bzl", "ray_deps_setup") + + ray_deps_setup() + ++load("//:thirdparty/systemlibs/repo.bzl", "ray_systemlibs") ++ ++ray_systemlibs() ++ + load("//bazel:ray_deps_build_all.bzl", "ray_deps_build_all") + + ray_deps_build_all() +-- +2.43.0 + diff --git a/recipe/patches/0002-Unvendor-boost.patch b/recipe/patches/0002-Unvendor-boost.patch new file mode 100644 index 00000000..7d2ced7b --- /dev/null +++ b/recipe/patches/0002-Unvendor-boost.patch @@ -0,0 +1,193 @@ +From 8d2f25e3548faf50ae7dc12efc78a7c8ab38a3ee Mon Sep 17 00:00:00 2001 +From: Austin Morton +Date: Tue, 2 Sep 2025 06:31:13 -0500 +Subject: [PATCH 2/2] Unvendor boost + +--- + bazel/ray_deps_build_all.bzl | 2 -- + bazel/ray_deps_setup.bzl | 11 ----------- + cpp/BUILD.bazel | 9 --------- + cpp/src/ray/util/util.cc | 10 ++++------ + src/ray/common/asio/asio_util.h | 1 + + src/ray/common/asio/instrumented_io_context.h | 1 + + src/ray/gcs/redis_context.cc | 7 ++----- + src/ray/object_manager/plasma/get_request_queue.cc | 2 +- + src/ray/raylet/worker_pool.h | 2 +- + src/ray/rpc/grpc_client.h | 1 + + 10 files changed, 11 insertions(+), 35 deletions(-) + +diff --git a/bazel/ray_deps_build_all.bzl b/bazel/ray_deps_build_all.bzl +index 8d59beab32..cfa861b7ec 100644 +--- a/bazel/ray_deps_build_all.bzl ++++ b/bazel/ray_deps_build_all.bzl +@@ -1,6 +1,5 @@ + load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") + 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") + load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") +@@ -14,7 +13,6 @@ load("@rules_foreign_cc_thirdparty//openssl:openssl_setup.bzl", "openssl_setup") + def ray_deps_build_all(): + bazel_skylib_workspace() + gen_java_deps() +- boost_deps() + prometheus_cpp_repositories() + python_configure(name = "local_config_python") + grpc_deps() +diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl +index 5ece022cdb..ef0e4cdef0 100644 +--- a/bazel/ray_deps_setup.bzl ++++ b/bazel/ray_deps_setup.bzl +@@ -167,17 +167,6 @@ def ray_deps_setup(): + ], + ) + +- auto_http_archive( +- name = "com_github_nelhage_rules_boost", +- # If you update the Boost version, remember to update the 'boost' rule. +- url = "https://github.com/nelhage/rules_boost/archive/57c99395e15720e287471d79178d36a85b64d6f6.tar.gz", +- sha256 = "490d11425393eed068966a4990ead1ff07c658f823fd982fddac67006ccc44ab", +- patches = [ +- "//thirdparty/patches:boost-headers.patch", +- ], +- patch_args = ["-p1"], +- ) +- + http_archive( + name = "com_github_google_flatbuffers", + url = "https://github.com/google/flatbuffers/archive/refs/tags/v25.2.10.tar.gz", +diff --git a/cpp/BUILD.bazel b/cpp/BUILD.bazel +index 3164cf7cac..9cc6a45333 100644 +--- a/cpp/BUILD.bazel ++++ b/cpp/BUILD.bazel +@@ -165,14 +165,6 @@ pkg_files( + visibility = ["//visibility:private"], + ) + +-pkg_files( +- name = "boost_ray_hdrs_files", +- srcs = ["@boost//:boost_ray_hdrs"], +- prefix = "ray/cpp/include/boost/", +- strip_prefix = "boost", +- visibility = ["//visibility:private"], +-) +- + pkg_files( + name = "default_worker_files", + srcs = ["default_worker"], +@@ -192,7 +184,6 @@ pkg_files( + pkg_zip( + name = "ray_cpp_pkg_zip", + srcs = [ +- ":boost_ray_hdrs_files", + ":default_worker_files", + ":example_files", + ":libray_api_files", +diff --git a/cpp/src/ray/util/util.cc b/cpp/src/ray/util/util.cc +index 003451b79f..1117fa9e0e 100644 +--- a/cpp/src/ray/util/util.cc ++++ b/cpp/src/ray/util/util.cc +@@ -28,14 +28,12 @@ std::string GetNodeIpAddress(const std::string &address) { + auto parts = ParseAddress(address); + RAY_CHECK(parts.has_value()); + try { +- boost::asio::io_service netService; ++ boost::asio::io_context netService; + boost::asio::ip::udp::resolver resolver(netService); +- boost::asio::ip::udp::resolver::query query( +- boost::asio::ip::udp::v4(), (*parts)[0], (*parts)[1]); +- boost::asio::ip::udp::resolver::iterator endpoints = resolver.resolve(query); +- boost::asio::ip::udp::endpoint ep = *endpoints; ++ const auto results = resolver.resolve((*parts)[0], (*parts)[1]); ++ if (results.size() == 0) return ""; + boost::asio::ip::udp::socket socket(netService); +- socket.connect(ep); ++ socket.connect(results.begin()->endpoint()); + boost::asio::ip::address addr = socket.local_endpoint().address(); + return addr.to_string(); + } catch (std::exception &e) { +diff --git a/src/ray/common/asio/asio_util.h b/src/ray/common/asio/asio_util.h +index 38564c8ac0..fe7f22d4a1 100644 +--- a/src/ray/common/asio/asio_util.h ++++ b/src/ray/common/asio/asio_util.h +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/ray/common/asio/instrumented_io_context.h b/src/ray/common/asio/instrumented_io_context.h +index 120023233a..4f83cb13f9 100644 +--- a/src/ray/common/asio/instrumented_io_context.h ++++ b/src/ray/common/asio/instrumented_io_context.h +@@ -15,6 +15,7 @@ + #pragma once + + #include ++#include + #include + #include + #include +diff --git a/src/ray/gcs/redis_context.cc b/src/ray/gcs/redis_context.cc +index 3ee8c564e9..72ca6d24a4 100644 +--- a/src/ray/gcs/redis_context.cc ++++ b/src/ray/gcs/redis_context.cc +@@ -571,12 +571,9 @@ std::vector ResolveDNS(instrumented_io_context &io_service, + int port) { + using namespace boost::asio; // NOLINT + ip::tcp::resolver resolver(io_service); +- ip::tcp::resolver::iterator iter = resolver.resolve(address, std::to_string(port)); +- ip::tcp::resolver::iterator end; + std::vector ip_addresses; +- while (iter != end) { +- ip::tcp::endpoint endpoint = *iter++; +- ip_addresses.push_back(endpoint.address().to_string()); ++ for (const auto& entry : resolver.resolve(address, std::to_string(port))) { ++ ip_addresses.push_back(entry.endpoint().address().to_string()); + } + return ip_addresses; + } +diff --git a/src/ray/object_manager/plasma/get_request_queue.cc b/src/ray/object_manager/plasma/get_request_queue.cc +index 286440f377..16482d1305 100644 +--- a/src/ray/object_manager/plasma/get_request_queue.cc ++++ b/src/ray/object_manager/plasma/get_request_queue.cc +@@ -35,7 +35,7 @@ void GetRequest::AsyncWait( + std::function on_timeout) { + RAY_CHECK(!is_removed_); + // Set an expiry time relative to now. +- timer_.expires_from_now(std::chrono::milliseconds(timeout_ms)); ++ timer_.expires_after(std::chrono::milliseconds(timeout_ms)); + timer_.async_wait(on_timeout); + } + +diff --git a/src/ray/raylet/worker_pool.h b/src/ray/raylet/worker_pool.h +index 2f8b02e3b5..9916e15845 100644 +--- a/src/ray/raylet/worker_pool.h ++++ b/src/ray/raylet/worker_pool.h +@@ -17,7 +17,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +diff --git a/src/ray/rpc/grpc_client.h b/src/ray/rpc/grpc_client.h +index 279d14a4dc..9e1b3846f0 100644 +--- a/src/ray/rpc/grpc_client.h ++++ b/src/ray/rpc/grpc_client.h +@@ -17,6 +17,7 @@ + #include + + #include ++#include + #include + #include + #include +-- +2.43.0 + diff --git a/recipe/patches/0008-patch-zlib-in-prometheus-cpp-and-boost.patch b/recipe/patches/0008-patch-zlib-in-prometheus-cpp-and-boost.patch deleted file mode 100644 index 89815150..00000000 --- a/recipe/patches/0008-patch-zlib-in-prometheus-cpp-and-boost.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 01f9e567d0c412860b69213e1195c5c131125972 Mon Sep 17 00:00:00 2001 -From: Matti Picus -Date: Fri, 29 Aug 2025 00:16:11 +0300 -Subject: [PATCH 08/11] patch zlib in prometheus-cpp and boost - ---- - bazel/ray_deps_setup.bzl | 1 + - thirdparty/patches/boost-zlib-fdopen.patch | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+) - create mode 100644 thirdparty/patches/boost-zlib-fdopen.patch - -diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl -index 344e4255ff..5e78d42322 100644 ---- a/bazel/ray_deps_setup.bzl -+++ b/bazel/ray_deps_setup.bzl -@@ -174,6 +174,7 @@ def ray_deps_setup(): - sha256 = "490d11425393eed068966a4990ead1ff07c658f823fd982fddac67006ccc44ab", - patches = [ - "//thirdparty/patches:boost-headers.patch", -+ "//thirdparty/patches:boost-zlib-fdopen.patch", -+ "//thirdparty/patches:boost-mirrors.patch", - ], - patch_args = ["-p1"], - ) -diff --git a/thirdparty/patches/boost-zlib-fdopen.patch b/thirdparty/patches/boost-zlib-fdopen.patch -new file mode 100644 -index 0000000000..76b2585f96 ---- /dev/null -+++ b/thirdparty/patches/boost-zlib-fdopen.patch -@@ -0,0 +1,16 @@ -+diff -u /tmp/boost.bzl com_github_nelhage_rules_boost/boost/boost.bzl -+--- a/boost/boost.bzl -++++ b/boost/boost.bzl -+@@ -164,6 +164,9 @@ -+ url = "https://github.com/madler/zlib/archive/v1.2.13.tar.gz", -+ sha256 = "1525952a0a567581792613a9723333d7f8cc20b87a81f920fb8bc7e3f2251428", -+ strip_prefix = "zlib-1.2.13", -++ patches = [ -++ "@io_ray//thirdparty/patches:zlib-fdopen.patch", -++ ], -+ ) -+ -+ maybe( -+ -+ -+ -diff --git a/thirdparty/patches/boost-mirrors.patch b/thirdparty/patches/boost-mirrors.patch -new file mode 100644 -index 0000000000..77c766c1b0 ---- /dev/null -+++ b/thirdparty/patches/boost-mirrors.patch -@@ -0,0 +1,13 @@ -+diff --git a/boost/boost.bzl b/boost/boost.bzl -+index fc56a14..e54c4e7 100644 -+--- a/boost/boost.bzl -++++ b/boost/boost.bzl -+@@ -178,7 +178,7 @@ def boost_deps(): -+ ] -+ ) -+ -+- SOURCEFORGE_MIRRORS = ["cfhcable", "superb-sea2", "cytranet", "iweb", "gigenet", "ayera", "astuteinternet", "pilotfiber", "svwh"] -++ SOURCEFORGE_MIRRORS = ["cytranet-dal", "gigenet", "psychz"] -+ -+ maybe( -+ http_archive, --- -2.39.5 (Apple Git-154) - diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 21b00183..613fe90c 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -12,8 +12,9 @@ source: url: https://github.com/ray-project/ray/archive/ray-${{ version }}.tar.gz sha256: cf9d2dbf6aae23fdbaca41297de115cd95daf81baf2005cd088cb3e0586a0763 patches: + - patches/0001-Add-ray_systemlibs.patch + - patches/0002-Unvendor-boost.patch - patches/0001-Disable-making-entry-scripts.patch - - patches/0002-Ignore-warnings-in-event.cc-and-logging.cc.patch - patches/0003-Newer-hermetic-python.patch # This needs modification for each release - patches/0004-update-commit-sha.patch @@ -22,20 +23,16 @@ source: # ABI breakage - patches/0005-Vendor-grpc-1.67.1.patch - patches/0006-remove-stdlib-libc-from-.bazelrc.patch - # Patch around non-const NAN on windows in protobuf 27.5 - - patches/0007-patch-protobuf-use-of-nan-on-windows.patch - - patches/0008-patch-zlib-in-prometheus-cpp-and-boost.patch - # Add missing include in new logging code for different absl - - patches/0009-add-missing-include.patch # Patch bundled fmtlib/fmt in spdlog for char8_type which is invalid on macOS - - patches/0010-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch + # need to fix patch if still required + # - patches/0010-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch # Avoid building openssl-1.1.1f and redis, not needed in the shipped package - patches/0011-do-not-build-redis-openssl.patch # Turns off --incompatible_strict_action_env - patches/0012-No-path-isolation.patch build: - number: 0 + number: 1 outputs: - package: @@ -102,6 +99,7 @@ outputs: - python - pip - packaging + - libboost-devel - libgrpc - openjdk =11 - setuptools diff --git a/recipe/systemlibs/boost.BUILD b/recipe/systemlibs/boost.BUILD new file mode 100644 index 00000000..8f0caa67 --- /dev/null +++ b/recipe/systemlibs/boost.BUILD @@ -0,0 +1,94 @@ +cc_library( + name = "asio", + visibility = ["//visibility:public"], +) + +cc_library( + name = "beast", + visibility = ["//visibility:public"], +) + +cc_library( + name = "bimap", + visibility = ["//visibility:public"], +) + +cc_library( + name = "bind", + visibility = ["//visibility:public"], +) + +cc_library( + name = "callable_traits", + visibility = ["//visibility:public"], +) + +cc_library( + name = "circular_buffer", + visibility = ["//visibility:public"], +) + +cc_library( + name = "container_hash", + visibility = ["//visibility:public"], +) + +cc_library( + name = "dll", + visibility = ["//visibility:public"], +) + +cc_library( + name = "endian", + visibility = ["//visibility:public"], +) + +cc_library( + name = "fiber", + linkopts = ["-lboost_fiber"], + visibility = ["//visibility:public"], +) + +cc_library( + name = "filesystem", + linkopts = ["-lboost_filesystem"], + visibility = ["//visibility:public"], +) + +cc_library( + name = "functional", + visibility = ["//visibility:public"], +) + +cc_library( + name = "iostreams", + linkopts = ["-lboost_iostreams"], + visibility = ["//visibility:public"], +) + +cc_library( + name = "optional", + visibility = ["//visibility:public"], +) + +cc_library( + name = "process", + linkopts = ["-lboost_process"], + visibility = ["//visibility:public"], +) + +cc_library( + name = "range", + visibility = ["//visibility:public"], +) + +cc_library( + name = "system", + visibility = ["//visibility:public"], +) + +cc_library( + name = "thread", + linkopts = ["-lboost_thread"], + visibility = ["//visibility:public"], +) diff --git a/recipe/systemlibs/repo.bzl b/recipe/systemlibs/repo.bzl new file mode 100644 index 00000000..f5e11131 --- /dev/null +++ b/recipe/systemlibs/repo.bzl @@ -0,0 +1,6 @@ +def ray_systemlibs(): + native.new_local_repository( + name = "boost", + path = "/usr/lib", + build_file = "//:thirdparty/systemlibs/boost.BUILD" + )
linux_64_python3.10.____cpython - - variant + + variant
linux_64_python3.11.____cpython - - variant + + variant
linux_64_python3.12.____cpython - - variant + + variant
osx_64_python3.10.____cpython - - variant + + variant
osx_64_python3.11.____cpython - - variant + + variant
osx_64_python3.12.____cpython - - variant + + variant
osx_arm64_python3.10.____cpython - - variant + + variant
osx_arm64_python3.11.____cpython - - variant + + variant
osx_arm64_python3.12.____cpython - - variant + + variant
win_64_python3.10.____cpython - - variant + + variant
win_64_python3.11.____cpython - - variant + + variant
win_64_python3.12.____cpython - - variant + + variant