Skip to content

Commit

Permalink
[docker/ci] Build ray-ml docker image for python 3.9 and 3.10 (ray-pr…
Browse files Browse the repository at this point in the history
…oject#28123)

This PR updates a few dependencies to be compatible with Python 3.10 and activates build of the ray-ml docker images for Python 3.9 and Python 3.10

Signed-off-by: acxz <[email protected]>
Signed-off-by: Kai Fricke <[email protected]>
Signed-off-by: Amog Kamsetty <[email protected]>
Co-authored-by: Kai Fricke <[email protected]>
Co-authored-by: Amog Kamsetty <[email protected]>
  • Loading branch information
3 people committed Oct 29, 2022
1 parent 4ef2683 commit 8b3f6f5
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
- pip install -q docker aws_requests_auth boto3
- ./ci/env/env_info.sh
- if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then python .buildkite/copy_files.py --destination docker_login; fi
- python ./ci/build/build-docker-images.py --py-versions py310 --device-types cpu cu101 cu102 --build-type BUILDKITE --build-base
- python ./ci/build/build-docker-images.py --py-versions py310 --device-types cpu cu101 cu102 cu110 --build-type BUILDKITE --build-base

- label: ":docker: Build Images: py310 (2/2)"
conditions: ["RAY_CI_LINUX_WHEELS_AFFECTED"]
Expand All @@ -161,7 +161,7 @@
- LINUX_WHEELS=1 ./ci/ci.sh build
- pip install -q docker aws_requests_auth boto3
- if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then python .buildkite/copy_files.py --destination docker_login; fi
- python ./ci/build/build-docker-images.py --py-versions py310 --device-types cu110 cu111 cu112 --build-type BUILDKITE --build-base
- python ./ci/build/build-docker-images.py --py-versions py310 --device-types cu111 cu112 cu113 cu116 --build-type BUILDKITE --build-base

- label: ":java: Java"
conditions: ["RAY_CI_JAVA_AFFECTED"]
Expand Down
18 changes: 0 additions & 18 deletions ci/build/build-docker-images.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,6 @@ def _build_docker_image(
f" {BASE_IMAGES.keys()}"
)

# TODO(https://github.com/ray-project/ray/issues/16599):
# remove below after supporting ray-ml images with Python 3.9/3.10
if image_name == "ray-ml" and py_version in {"py39", "py310"}:
print(f"{image_name} image is currently unsupported with " "Python 3.9/3.10")
return

build_args = {}
build_args["PYTHON_VERSION"] = PY_MATRIX[py_version]
# I.e. "py310"[3:] == 10
Expand Down Expand Up @@ -481,18 +475,6 @@ def push_and_tag_images(
)
continue

# TODO(https://github.com/ray-project/ray/issues/16599):
# remove below after supporting ray-ml images with Python 3.9/3.10
if image_name in ["ray-ml"] and (
PY_MATRIX[py_name].startswith("3.9")
or PY_MATRIX[py_name].startswith("3.10")
):
print(
f"{image_name} image is currently "
f"unsupported with Python 3.9/3.10"
)
continue

tag = f"nightly-{py_name}-{image_type}"
tag_mapping[tag].append(tag)

Expand Down
4 changes: 0 additions & 4 deletions doc/source/ray-overview/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ You can install the nightly Ray wheels via the following links. These daily rele
`Linux Python 3.6`_ `MacOS Python 3.6`_
==================== ==================== =======================

.. note::

Python 3.9/3.10 support is currently experimental.

.. note::

On Windows, support for multi-node Ray clusters is currently experimental and untested.
Expand Down
2 changes: 1 addition & 1 deletion docker/fix-docker-latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ lambda invoke --function-name DockerTagLatest \
--cli-read-timeout 600 \
--payload "{\"source_tag\" : \"$IMAGE\", \"destination_tag\" : \"latest\"}" /dev/stdout

echo -e "Please check logs before rerunning!!!!\n\nAt the time of writing, Autoscaler Images are not built & Ray-ML Images are not built for Py39/Py310\nSo retagging errors for those images are expected!"
echo -e "Please check logs before rerunning!!!!\n\nAt the time of writing, Autoscaler Images are not built.\nSo retagging errors for those images are expected!"
4 changes: 2 additions & 2 deletions python/requirements/data_processing/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dask[complete]==2021.03.0; python_version < '3.7'
dask[complete]==2022.2.0; python_version >= '3.7'
dask[complete]==2022.2.0; python_version < '3.8'
dask[complete]==2022.10.1; python_version >= '3.8'
aioboto3==8.3.0
flask_cors
moto[s3]==2.3.1
Expand Down
2 changes: 1 addition & 1 deletion python/requirements/ml/requirements_rllib.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pybullet==3.2.0
recsim==0.2.4
tensorflow_estimator==2.9.0
# DeepMind's OpenSpiel
open-spiel==1.0.2
open-spiel==1.2

# Other.
# ------
Expand Down
2 changes: 1 addition & 1 deletion python/requirements/ml/requirements_tune.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ freezegun==1.1.0
gluoncv==0.10.1.post0
gpy==1.10.0
autorom[accept-rom-license]
h5py==3.1.0
h5py==3.7.0
hpbandster==0.7.4
HEBO==0.3.2
hyperopt==0.2.5
Expand Down

0 comments on commit 8b3f6f5

Please sign in to comment.