Skip to content

Commit

Permalink
Fix aws_cluster_launcher_full
Browse files Browse the repository at this point in the history
Signed-off-by: Jiajun Yao <jeromeyjj@gmail.com>
  • Loading branch information
jjyao committed Sep 5, 2024
1 parent 3d4ea77 commit 9a4041e
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion docker/base-deps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Images are `tagged` with the format `{Ray version}[-{Python version}][-{Platform
| `x.y.z` | A specific Ray release, e.g. 2.9.3 |
| `nightly` | The most recent Ray development build (a recent commit from GitHub `master`) |

The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py38`, `py39` and `py310`. If unspecified, the tag points to an image using `Python 3.8`.
The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py39`, `py310` and `py311`. If unspecified, the tag points to an image using `Python 3.9`.

The optional `Platform` tag specifies the platform where the image is intended for:

Expand Down
2 changes: 1 addition & 1 deletion docker/ray-deps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Images are `tagged` with the format `{Ray version}[-{Python version}][-{Platform
| `x.y.z` | A specific Ray release, e.g. 2.9.3 |
| `nightly` | The most recent Ray development build (a recent commit from GitHub `master`) |

The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py38`, `py39` and `py310`. If unspecified, the tag points to an image using `Python 3.8`.
The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py39`, `py310` and `py311`. If unspecified, the tag points to an image using `Python 3.9`.

The optional `Platform` tag specifies the platform where the image is intended for:

Expand Down
8 changes: 4 additions & 4 deletions docker/ray-ml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Images are `tagged` with the format `{Ray version}[-{Python version}][-{Platform
| `x.y.z` | A specific Ray release, e.g. 2.9.3 |
| `nightly` | The most recent Ray development build (a recent commit from GitHub `master`) |

The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py38`, `py39` and `py310`. If unspecified, the tag points to an image using `Python 3.8`.
The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py39`, `py310` and `py311`. If unspecified, the tag points to an image using `Python 3.9`.

The optional `Platform` tag specifies the platform where the image is intended for:

Expand All @@ -24,9 +24,9 @@ The optional `Platform` tag specifies the platform where the image is intended f

Examples tags:
- none: equivalent to `latest`
- `latest`: equivalent to `latest-py38-gpu`, i.e. image for the most recent Ray release
- `nightly-py38-cpu`
- `806c18-py38-cu112`
- `latest`: equivalent to `latest-py39-gpu`, i.e. image for the most recent Ray release
- `nightly-py39-cpu`
- `806c18-py39-cu112`

The `ray-ml` images are not built for the `arm64` (`aarch64`) architecture.

Expand Down
10 changes: 5 additions & 5 deletions docker/ray/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Images are `tagged` with the format `{Ray version}[-{Python version}][-{Platform
| `x.y.z` | A specific Ray release, e.g. 2.9.3 |
| `nightly` | The most recent Ray development build (a recent commit from GitHub `master`) |

The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py38`, `py39` and `py310`. If unspecified, the tag points to an image using `Python 3.8`.
The optional `Python version` tag specifies the Python version in the image. All Python versions supported by Ray are available, e.g. `py39`, `py310` and `py311`. If unspecified, the tag points to an image using `Python 3.9`.

The optional `Platform` tag specifies the platform where the image is intended for:

Expand All @@ -36,10 +36,10 @@ Please note that suffixes are only used to specify `aarch64` images. No suffix m

Examples tags:
- none: equivalent to `latest`
- `latest`: equivalent to `latest-py38-cpu`, i.e. image for the most recent Ray release
- `nightly-py38-cpu`
- `806c18-py38-cu112`
- `806c18-py38-cu116-aarch64`
- `latest`: equivalent to `latest-py39-cpu`, i.e. image for the most recent Ray release
- `nightly-py39-cpu`
- `806c18-py39-cu112`
- `806c18-py39-cu116-aarch64`

## Roadmap

Expand Down
2 changes: 1 addition & 1 deletion docker/retag-lambda/lambda_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def lambda_handler(event, context):
[print(i) for i in results]
total_results.extend(results)

# Retag images without a python version specified (defaults to py38)
# Retag images without a python version specified (defaults to py39)
results = []
for repo in ["ray", "ray-ml", "ray-deps", "base-deps"]:
# For example tag ray:1.X-cu112 to ray:latest-cu112
Expand Down
2 changes: 1 addition & 1 deletion python/ray/autoscaler/aws/tests/aws_config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
base_image: {{ env["RAY_IMAGE_NIGHTLY_CPU"] | default("anyscale/ray:nightly-py38") }}
base_image: {{ env["RAY_IMAGE_NIGHTLY_CPU"] | default("anyscale/ray:nightly-py39") }}
debian_packages: []
env_vars:
RAY_WHEEL_URL: {{ env["RAY_WHEELS"] | default("") }}
Expand Down
2 changes: 1 addition & 1 deletion python/ray/autoscaler/gcp/tests/gce_config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
base_image: {{ env["RAY_IMAGE_NIGHTLY_CPU"] | default("anyscale/ray:nightly-py38") }}
base_image: {{ env["RAY_IMAGE_NIGHTLY_CPU"] | default("anyscale/ray:nightly-py39") }}
debian_packages: []
env_vars:
RAY_WHEEL_URL: {{ env["RAY_WHEELS"] | default("") }}
Expand Down
6 changes: 3 additions & 3 deletions python/ray/autoscaler/launch_and_verify_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ def get_docker_image(docker_override):
applicable.
"""
if docker_override == "latest":
return "rayproject/ray:latest-py38"
return "rayproject/ray:latest-py39"
elif docker_override == "nightly":
return "rayproject/ray:nightly-py38"
return "rayproject/ray:nightly-py39"
elif docker_override == "commit":
if re.match("^[0-9]+.[0-9]+.[0-9]+$", ray.__version__):
return f"rayproject/ray:{ray.__version__}.{ray.__commit__[:6]}-py38"
return f"rayproject/ray:{ray.__version__}.{ray.__commit__[:6]}-py39"
else:
print(
"Error: docker image is only available for "
Expand Down
2 changes: 1 addition & 1 deletion release/release_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4933,7 +4933,7 @@

run:
timeout: 3000
script: python launch_and_verify_cluster.py aws/example-full.yaml --num-expected-nodes 2 --retries 20
script: python launch_and_verify_cluster.py aws/example-full.yaml --num-expected-nodes 2 --retries 20 --docker-override latest

- name: gcp_cluster_launcher_minimal
group: cluster-launcher-test
Expand Down

0 comments on commit 9a4041e

Please sign in to comment.