Skip to content

Commit e9aede3

Browse files
aslonniedstrodtman
authored andcommitted
[wheel] mac: upgrade arm64 wheel to macos 12 (ray-project#54323)
now wheels for both intel and apple silicon are on the same version `ray[all]` does not work on arm64 macos 11 anyways, as `scipy` does not have the related wheels Signed-off-by: Lonnie Liu <[email protected]> Signed-off-by: Douglas Strodtman <[email protected]>
1 parent bc7a9d8 commit e9aede3

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

ci/ray_ci/automation/ray_wheels_lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"manylinux2014_x86_64",
1818
"manylinux2014_aarch64",
1919
"macosx_12_0_x86_64",
20-
"macosx_11_0_arm64",
20+
"macosx_12_0_arm64",
2121
"win_amd64",
2222
]
2323
RAY_TYPES = ["ray", "ray_cpp"]

ci/ray_ci/automation/test_pypi_lib.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def test_get_pypi_token_fail(mock_boto3_client):
5858
def test_upload_wheels_to_pypi(mock_subprocess, mock_get_pypi_url, mock_get_pypi_token):
5959
pypi_env = "test"
6060
wheels = [
61-
"ray_cpp-2.9.3-cp310-cp310-macosx_11_0_arm64.whl",
62-
"ray_cpp-2.9.3-cp311-cp311-macosx_11_0_arm64.whl",
61+
"ray_cpp-2.9.3-cp310-cp310-macosx_12_0_arm64.whl",
62+
"ray_cpp-2.9.3-cp311-cp311-macosx_12_0_arm64.whl",
6363
]
6464
mock_get_pypi_token.return_value = "test_token"
6565
mock_get_pypi_url.return_value = "test_pypi_url"
@@ -97,8 +97,8 @@ def test_upload_wheels_to_pypi_fail_twine_upload(
9797
):
9898
pypi_env = "test"
9999
wheels = [
100-
"ray_cpp-2.9.3-cp310-cp310-macosx_11_0_arm64.whl",
101-
"ray_cpp-2.9.3-cp311-cp311-macosx_11_0_arm64.whl",
100+
"ray_cpp-2.9.3-cp310-cp310-macosx_12_0_arm64.whl",
101+
"ray_cpp-2.9.3-cp311-cp311-macosx_12_0_arm64.whl",
102102
]
103103
mock_get_pypi_token.return_value = "test_token"
104104
mock_get_pypi_url.return_value = "test_pypi_url"
@@ -117,8 +117,8 @@ def test_upload_wheels_to_pypi_fail_twine_upload(
117117
def test_upload_wheels_to_pypi_fail_get_pypi(mock_get_pypi_url, mock_get_pypi_token):
118118
pypi_env = "test"
119119
wheels = [
120-
"ray_cpp-2.9.3-cp310-cp310-macosx_11_0_arm64.whl",
121-
"ray_cpp-2.9.3-cp311-cp311-macosx_11_0_arm64.whl",
120+
"ray_cpp-2.9.3-cp310-cp310-macosx_12_0_arm64.whl",
121+
"ray_cpp-2.9.3-cp311-cp311-macosx_12_0_arm64.whl",
122122
]
123123
mock_get_pypi_token.side_effect = ValueError("Invalid pypi_env: test")
124124
mock_get_pypi_url.side_effect = ValueError("Invalid pypi_env: test")

ci/ray_ci/automation/test_ray_wheels_lib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"ray-1.0.0-cp39-cp39-manylinux2014_x86_64",
2222
"ray-1.0.0-cp39-cp39-manylinux2014_aarch64",
2323
"ray-1.0.0-cp39-cp39-macosx_12_0_x86_64",
24-
"ray-1.0.0-cp39-cp39-macosx_11_0_arm64",
24+
"ray-1.0.0-cp39-cp39-macosx_12_0_arm64",
2525
"ray-1.0.0-cp39-cp39-win_amd64",
2626
]
2727

@@ -58,7 +58,7 @@ def test_check_downloaded_wheels():
5858
"ray-1.0.0-cp39-cp39-manylinux2014_x86_64",
5959
"ray-1.0.0-cp39-cp39-manylinux2014_aarch64",
6060
"ray-1.0.0-cp39-cp39-macosx_12_0_x86_64",
61-
"ray-1.0.0-cp39-cp39-macosx_11_0_arm64",
61+
"ray-1.0.0-cp39-cp39-macosx_12_0_arm64",
6262
"ray-1.0.0-cp39-cp39-win_amd64",
6363
]
6464

@@ -75,7 +75,7 @@ def test_check_downloaded_wheels_fail():
7575
"ray-1.0.0-cp39-cp39-manylinux2014_x86_64",
7676
"ray-1.0.0-cp39-cp39-manylinux2014_aarch64",
7777
"ray-1.0.0-cp39-cp39-macosx_12_0_x86_64",
78-
"ray-1.0.0-cp39-cp39-macosx_11_0_arm64",
78+
"ray-1.0.0-cp39-cp39-macosx_12_0_arm64",
7979
"ray-1.0.0-cp39-cp39-win_amd64",
8080
]
8181

@@ -94,7 +94,7 @@ def test_download_wheel_from_s3(mock_boto3_client):
9494
"releases/1.0.0/1234567/ray-1.0.0-cp39-cp39-manylinux2014_x86_64.whl",
9595
"releases/1.0.0/1234567/ray-1.0.0-cp39-cp39-manylinux2014_aarch64.whl",
9696
"releases/1.0.0/1234567/ray-1.0.0-cp39-cp39-macosx_12_0_x86_64.whl",
97-
"releases/1.0.0/1234567/ray-1.0.0-cp39-cp39-macosx_11_0_arm64.whl",
97+
"releases/1.0.0/1234567/ray-1.0.0-cp39-cp39-macosx_12_0_arm64.whl",
9898
"releases/1.0.0/1234567/ray-1.0.0-cp39-cp39-win_amd64.whl",
9999
]
100100
for key in keys:

doc/source/ray-overview/installation.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ You can install the nightly Ray wheels via the following links. These daily rele
163163
.. _`MacOS Python 3.12 (x86_64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp312-cp312-macosx_12_0_x86_64.whl
164164
.. _`MacOS Python 3.13 (x86_64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp313-cp313-macosx_12_0_x86_64.whl
165165

166-
.. _`MacOS Python 3.9 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp39-cp39-macosx_11_0_arm64.whl
167-
.. _`MacOS Python 3.10 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp310-cp310-macosx_11_0_arm64.whl
168-
.. _`MacOS Python 3.11 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp311-cp311-macosx_11_0_arm64.whl
169-
.. _`MacOS Python 3.12 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp312-cp312-macosx_11_0_arm64.whl
170-
.. _`MacOS Python 3.13 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp313-cp313-macosx_11_0_arm64.whl
166+
.. _`MacOS Python 3.9 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp39-cp39-macosx_12_0_arm64.whl
167+
.. _`MacOS Python 3.10 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp310-cp310-macosx_12_0_arm64.whl
168+
.. _`MacOS Python 3.11 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp311-cp311-macosx_12_0_arm64.whl
169+
.. _`MacOS Python 3.12 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp312-cp312-macosx_12_0_arm64.whl
170+
.. _`MacOS Python 3.13 (arm64)`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp313-cp313-macosx_12_0_arm64.whl
171171

172172

173173
.. _`Windows Python 3.9`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp39-cp39-win_amd64.whl

python/ray/_private/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,9 +916,9 @@ def get_wheel_filename(
916916
architecture = architecture or platform.processor()
917917

918918
if py_version_str in ["311", "310", "39", "38"] and architecture == "arm64":
919-
darwin_os_string = "macosx_11_0_arm64"
919+
darwin_os_string = "macosx_12_0_arm64"
920920
else:
921-
darwin_os_string = "macosx_10_15_x86_64"
921+
darwin_os_string = "macosx_12_0_x86_64"
922922

923923
if architecture == "aarch64":
924924
linux_os_string = "manylinux2014_aarch64"

python/ray/tests/test_runtime_env_get_wheel_names.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ def test_get_master_wheel_url():
3434
# This should be a commit for which wheels have already been built for
3535
# all platforms and python versions at
3636
# `s3://ray-wheels/master/<test_commit>/`.
37-
test_commit = "593d04aba2726a0104280d1bdbc2779e3a8ba7d4"
37+
#
38+
# Link to commit:
39+
# https://github.com/ray-project/ray/commit/263c7e1e66746c03f16e8ee20753d05a9936f6f0
40+
test_commit = "263c7e1e66746c03f16e8ee20753d05a9936f6f0"
3841
for sys_platform in ["darwin", "linux", "win32"]:
3942
for py_version in ray_constants.RUNTIME_ENV_CONDA_PY_VERSIONS:
4043
url = get_master_wheel_url(
@@ -48,7 +51,7 @@ def test_get_release_wheel_url():
4851
# This should be a commit for which wheels have already been built for
4952
# all platforms and python versions at
5053
# `s3://ray-wheels/releases/2.2.0/<commit>/`.
51-
test_commits = {"2.31.0": "1240d3fc326517f9be28bb7897c1c88619f0d984"}
54+
test_commits = {"2.47.1": "61d3f2f1aa33563faa398105f4abda88cb39440b"}
5255
for sys_platform in ["darwin", "linux", "win32"]:
5356
for py_version in ray_constants.RUNTIME_ENV_CONDA_PY_VERSIONS:
5457
for version, commit in test_commits.items():

0 commit comments

Comments
 (0)