From 2a3e042ca1dee0bdfbdd89c0baec37bbebda6410 Mon Sep 17 00:00:00 2001 From: can Date: Thu, 8 Jun 2023 20:40:25 +0000 Subject: [PATCH 1/2] Support docker build for 3.11 Signed-off-by: can --- .buildkite/pipeline.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.build.yml b/.buildkite/pipeline.build.yml index 9b0281036d43..10ece0416350 100644 --- a/.buildkite/pipeline.build.yml +++ b/.buildkite/pipeline.build.yml @@ -64,7 +64,7 @@ # Upload to latest directory. - if [ "$BUILDKITE_BRANCH" == "master" ]; then python .buildkite/copy_files.py --destination wheels --path ./.whl; fi -- label: ":docker: Build Images: {{matrix}} - cpu/cu115/cu116" +- label: ":docker: Build Images: {{matrix}} - cpu/cu115/116" conditions: ["RAY_CI_PYTHON_DEPENDENCIES_AFFECTED", "RAY_CI_DOCKER_AFFECTED", "RAY_CI_CORE_CPP_AFFECTED"] instance_size: medium commands: From 76b891f27110c029187375602d0ac9e0697b8786 Mon Sep 17 00:00:00 2001 From: can Date: Tue, 20 Jun 2023 17:53:30 +0000 Subject: [PATCH 2/2] Support python 3.11 for arm64 machines Signed-off-by: can --- .buildkite/pipeline.arm64.yml | 2 ++ .buildkite/pipeline.build.yml | 2 +- docker/base-deps/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.arm64.yml b/.buildkite/pipeline.arm64.yml index 9d6a8e5ee631..00e84a3a8155 100644 --- a/.buildkite/pipeline.arm64.yml +++ b/.buildkite/pipeline.arm64.yml @@ -46,6 +46,7 @@ - py38 - py39 - py310 + - py311 - label: ":mechanical_arm: :docker: Build Images: {{matrix}} [aarch64] cu117/cu118" conditions: ["RAY_CI_PYTHON_DEPENDENCIES_AFFECTED", "RAY_CI_DOCKER_AFFECTED", "RAY_CI_CORE_CPP_AFFECTED"] @@ -61,3 +62,4 @@ - py38 - py39 - py310 + - py311 diff --git a/.buildkite/pipeline.build.yml b/.buildkite/pipeline.build.yml index 10ece0416350..9b0281036d43 100644 --- a/.buildkite/pipeline.build.yml +++ b/.buildkite/pipeline.build.yml @@ -64,7 +64,7 @@ # Upload to latest directory. - if [ "$BUILDKITE_BRANCH" == "master" ]; then python .buildkite/copy_files.py --destination wheels --path ./.whl; fi -- label: ":docker: Build Images: {{matrix}} - cpu/cu115/116" +- label: ":docker: Build Images: {{matrix}} - cpu/cu115/cu116" conditions: ["RAY_CI_PYTHON_DEPENDENCIES_AFFECTED", "RAY_CI_DOCKER_AFFECTED", "RAY_CI_CORE_CPP_AFFECTED"] instance_size: medium commands: diff --git a/docker/base-deps/Dockerfile b/docker/base-deps/Dockerfile index 77b2b59eb6ee..0b8f90e2b409 100644 --- a/docker/base-deps/Dockerfile +++ b/docker/base-deps/Dockerfile @@ -76,7 +76,7 @@ RUN sudo apt-get update -y && sudo apt-get upgrade -y \ # We install cmake temporarily to get psutil && sudo apt-get autoremove -y cmake zlib1g-dev \ # We keep g++ on GPU images, because uninstalling removes CUDA Devel tooling - $(if [ "$BASE_IMAGE" = "ubuntu:focal" ]; then echo \ + $(if [[ "$BASE_IMAGE" == "ubuntu:focal" && "$HOSTTYPE" == "x86_64" ]]; then echo \ g++; fi) \ # Either install kubectl or remove wget && (if [ "$AUTOSCALER" = "autoscaler" ]; \