Skip to content

Commit d2d9840

Browse files
atalmanatalman
authored
Quick start module, remove macos x86 (pytorch#1608)
* Quick start module remove macos x86 * test
1 parent 0099db6 commit d2d9840

File tree

3 files changed

+8
-47
lines changed

3 files changed

+8
-47
lines changed

‎.github/workflows/update-quick-start-module.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ jobs:
3232
package-type: all
3333
os: windows
3434
channel: "nightly"
35-
macos-nightly-matrix:
36-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
37-
with:
38-
package-type: all
39-
os: macos
40-
channel: "nightly"
4135
macos-arm64-nightly-matrix:
4236
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
4337
with:
@@ -58,13 +52,6 @@ jobs:
5852
package-type: all
5953
os: windows
6054
channel: "release"
61-
macos-release-matrix:
62-
needs: [macos-nightly-matrix]
63-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
64-
with:
65-
package-type: all
66-
os: macos
67-
channel: "release"
6855
macos-arm64-release-matrix:
6956
needs: [macos-arm64-nightly-matrix]
7057
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
@@ -74,9 +61,8 @@ jobs:
7461
channel: "release"
7562

7663
update-quick-start:
77-
needs: [linux-nightly-matrix, windows-nightly-matrix, macos-nightly-matrix,
78-
macos-arm64-nightly-matrix, linux-release-matrix, windows-release-matrix,
79-
macos-release-matrix, macos-arm64-release-matrix]
64+
needs: [linux-nightly-matrix, windows-nightly-matrix, macos-arm64-nightly-matrix,
65+
linux-release-matrix, windows-release-matrix, macos-arm64-release-matrix]
8066
runs-on: "ubuntu-20.04"
8167
environment: pytorchbot-env
8268
steps:
@@ -92,22 +78,18 @@ jobs:
9278
env:
9379
LINUX_NIGHTLY_MATRIX: ${{ needs.linux-nightly-matrix.outputs.matrix }}
9480
WINDOWS_NIGHTLY_MATRIX: ${{ needs.windows-nightly-matrix.outputs.matrix }}
95-
MACOS_NIGHTLY_MATRIX: ${{ needs.macos-nightly-matrix.outputs.matrix }}
96-
MACOS_ARM64_NIGHTLY_MATRIX: ${{ needs.macos-arm64-nightly-matrix.outputs.matrix }}
81+
MACOS_NIGHTLY_MATRIX: ${{ needs.macos-arm64-nightly-matrix.outputs.matrix }}
9782
LINUX_RELEASE_MATRIX: ${{ needs.linux-release-matrix.outputs.matrix }}
9883
WINDOWS_RELEASE_MATRIX: ${{ needs.windows-release-matrix.outputs.matrix }}
99-
MACOS_RELEASE_MATRIX: ${{ needs.macos-release-matrix.outputs.matrix }}
100-
MACOS_ARM64_RELEASE_MATRIX: ${{ needs.macos-arm64-release-matrix.outputs.matrix }}
84+
MACOS_RELEASE_MATRIX: ${{ needs.macos-arm64-release-matrix.outputs.matrix }}
10185
run: |
10286
set -ex
10387
printf '%s\n' "$LINUX_NIGHTLY_MATRIX" > linux_nightly_matrix.json
10488
printf '%s\n' "$WINDOWS_NIGHTLY_MATRIX" > windows_nightly_matrix.json
10589
printf '%s\n' "$MACOS_NIGHTLY_MATRIX" > macos_nightly_matrix.json
106-
printf '%s\n' "$MACOS_ARM64_NIGHTLY_MATRIX" > macos_arm64_nightly_matrix.json
10790
printf '%s\n' "$LINUX_RELEASE_MATRIX" > linux_release_matrix.json
10891
printf '%s\n' "$WINDOWS_RELEASE_MATRIX" > windows_release_matrix.json
10992
printf '%s\n' "$MACOS_RELEASE_MATRIX" > macos_release_matrix.json
110-
printf '%s\n' "$MACOS_ARM64_RELEASE_MATRIX" > macos_arm64_release_matrix.json
11193
python3 ./scripts/gen_quick_start_module.py --autogenerate > assets/quick-start-module.js
11294
rm *_matrix.json
11395
- name: Create Issue if failed

‎published_versions.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,31 +118,27 @@
118118
"accnone": {
119119
"note": null,
120120
"versions": {
121-
"Download x86 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-x86_64-latest.zip",
122121
"Download arm64 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-arm64-latest.zip"
123122
}
124123
},
125124
"cuda.x": {
126125
"note": null,
127126
"default": true,
128127
"versions": {
129-
"Download x86 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-x86_64-latest.zip",
130128
"Download arm64 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-arm64-latest.zip"
131129
}
132130
},
133131
"cuda.y": {
134132
"note": null,
135133
"default": true,
136134
"versions": {
137-
"Download x86 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-x86_64-latest.zip",
138135
"Download arm64 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-arm64-latest.zip"
139136
}
140137
},
141138
"rocm5.x": {
142139
"note": null,
143140
"default": true,
144141
"versions": {
145-
"Download x86 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-x86_64-latest.zip",
146142
"Download arm64 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-arm64-latest.zip"
147143
}
148144
}
@@ -4131,4 +4127,4 @@
41314127
}
41324128
}
41334129
}
4134-
}
4130+
}

‎scripts/gen_quick_start_module.py

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class OperatingSystem(Enum):
2121
LINUX: str = "linux"
2222
WINDOWS: str = "windows"
2323
MACOS: str = "macos"
24-
MACOS_ARM64: str = "macos_arm64"
2524

2625
PRE_CXX11_ABI = "pre-cxx11"
2726
CXX11_ABI = "cxx11-abi"
@@ -31,21 +30,20 @@ class OperatingSystem(Enum):
3130
ENABLE = "enable"
3231
DISABLE = "disable"
3332
MACOS = "macos"
34-
MACOS_ARM64 = "macos-arm64"
3533

3634
# Mapping json to release matrix default values
3735
acc_arch_ver_default = {
3836
"nightly": {
3937
"accnone": ("cpu", ""),
4038
"cuda.x": ("cuda", "11.8"),
4139
"cuda.y": ("cuda", "12.1"),
42-
"rocm5.x": ("rocm", "5.7")
40+
"rocm5.x": ("rocm", "6.0")
4341
},
4442
"release": {
4543
"accnone": ("cpu", ""),
4644
"cuda.x": ("cuda", "11.8"),
4745
"cuda.y": ("cuda", "12.1"),
48-
"rocm5.x": ("rocm", "5.7")
46+
"rocm5.x": ("rocm", "6.0")
4947
}
5048
}
5149

@@ -59,8 +57,7 @@ class OperatingSystem(Enum):
5957
CXX11_ABI: "Download here (cxx11 ABI):",
6058
RELEASE: "Download here (Release version):",
6159
DEBUG: "Download here (Debug version):",
62-
MACOS: "Download x86 libtorch here (ROCm and CUDA are not supported):",
63-
MACOS_ARM64: "Download arm64 libtorch here (ROCm and CUDA are not supported):",
60+
MACOS: "Download arm64 libtorch here (ROCm and CUDA are not supported):",
6461
}
6562

6663
def load_json_from_basedir(filename: str):
@@ -124,16 +121,6 @@ def update_versions(versions, release_matrix, release_version):
124121
if (x["package_type"], x["gpu_arch_type"], x["gpu_arch_version"]) ==
125122
(package_type, gpu_arch_type, gpu_arch_version)
126123
]
127-
# MACOS and MACOS_ARM64 release matrices are reduced to
128-
# one single matrix in get started page. This is the only
129-
# OS that this logic applies to. Hence this logic is needed.
130-
pkg_arch_matrix_arm64 = []
131-
if os_key == OperatingSystem.MACOS.value and package_type == "libtorch":
132-
pkg_arch_matrix_arm64 = [
133-
x for x in release_matrix[OperatingSystem.MACOS_ARM64.value]
134-
if (x["package_type"], x["gpu_arch_type"], x["gpu_arch_version"]) ==
135-
(package_type, gpu_arch_type, gpu_arch_version)
136-
]
137124

138125
if pkg_arch_matrix:
139126
if package_type != "libtorch":
@@ -155,10 +142,6 @@ def update_versions(versions, release_matrix, release_version):
155142
elif os_key == OperatingSystem.MACOS.value:
156143
if instr["versions"] is not None:
157144
instr["versions"][LIBTORCH_DWNL_INSTR[MACOS]] = pkg_arch_matrix[0]["installation"]
158-
if len(pkg_arch_matrix_arm64) > 0:
159-
instr["versions"][LIBTORCH_DWNL_INSTR[MACOS_ARM64]] = pkg_arch_matrix_arm64[0]["installation"]
160-
else:
161-
instr["versions"].pop(LIBTORCH_DWNL_INSTR[MACOS_ARM64], None)
162145

163146
# This method is used for generating new quick-start-module.js
164147
# from the versions json object

0 commit comments

Comments
 (0)