Skip to content

Commit 9b927cd

Browse files
atalmanatalman
committed
Install torchvision before torch for ROCm validation and getting-started commands
1 parent 02bbd4f commit 9b927cd

3 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎tools/scripts/generate_binary_build_matrix.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130

131131
PACKAGES_TO_INSTALL_WHL = "torch torchvision"
132132
PACKAGES_TO_INSTALL_GETTING_STARTED_WHL = "torch torchvision"
133+
PACKAGES_TO_INSTALL_ROCM_WHL = "torchvision torch"
133134
PACKAGES_TO_INSTALL_WHL_WIN_ARM64 = "torch"
134135
WHL_INSTALL_BASE = "pip3 install"
135136
DOWNLOAD_URL_BASE = "https://download.pytorch.org"
@@ -324,6 +325,9 @@ def get_wheel_install_command(
324325
else PACKAGES_TO_INSTALL_WHL
325326
)
326327

328+
if gpu_arch_type == ROCM:
329+
PACKAGES_TO_INSTALL = PACKAGES_TO_INSTALL_ROCM_WHL
330+
327331
# Validate torch only (no torchvision) for versions without published
328332
# torchvision wheels, e.g. 3.15 / 3.15t.
329333
if python_version in TORCH_ONLY_PYTHON_ARCHES:

‎tools/tests/assets/build_matrix_linux_wheel_cuda.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"package_type": "manywheel",
8080
"build_name": "manywheel-py3_10-rocm7_2",
8181
"validation_runner": "linux.2xlarge",
82-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
82+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
8383
"channel": "nightly",
8484
"upload_to_base_bucket": "no",
8585
"stable_version": "2.13.0"
@@ -93,7 +93,7 @@
9393
"package_type": "manywheel",
9494
"build_name": "manywheel-py3_10-rocm7_14",
9595
"validation_runner": "linux.2xlarge",
96-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
96+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
9797
"channel": "nightly",
9898
"upload_to_base_bucket": "no",
9999
"stable_version": "2.13.0"
@@ -177,7 +177,7 @@
177177
"package_type": "manywheel",
178178
"build_name": "manywheel-py3_11-rocm7_2",
179179
"validation_runner": "linux.2xlarge",
180-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
180+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
181181
"channel": "nightly",
182182
"upload_to_base_bucket": "no",
183183
"stable_version": "2.13.0"
@@ -191,7 +191,7 @@
191191
"package_type": "manywheel",
192192
"build_name": "manywheel-py3_11-rocm7_14",
193193
"validation_runner": "linux.2xlarge",
194-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
194+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
195195
"channel": "nightly",
196196
"upload_to_base_bucket": "no",
197197
"stable_version": "2.13.0"
@@ -275,7 +275,7 @@
275275
"package_type": "manywheel",
276276
"build_name": "manywheel-py3_12-rocm7_2",
277277
"validation_runner": "linux.2xlarge",
278-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
278+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
279279
"channel": "nightly",
280280
"upload_to_base_bucket": "no",
281281
"stable_version": "2.13.0"
@@ -289,7 +289,7 @@
289289
"package_type": "manywheel",
290290
"build_name": "manywheel-py3_12-rocm7_14",
291291
"validation_runner": "linux.2xlarge",
292-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
292+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
293293
"channel": "nightly",
294294
"upload_to_base_bucket": "no",
295295
"stable_version": "2.13.0"
@@ -373,7 +373,7 @@
373373
"package_type": "manywheel",
374374
"build_name": "manywheel-py3_13-rocm7_2",
375375
"validation_runner": "linux.2xlarge",
376-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
376+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
377377
"channel": "nightly",
378378
"upload_to_base_bucket": "no",
379379
"stable_version": "2.13.0"
@@ -387,7 +387,7 @@
387387
"package_type": "manywheel",
388388
"build_name": "manywheel-py3_13-rocm7_14",
389389
"validation_runner": "linux.2xlarge",
390-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
390+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
391391
"channel": "nightly",
392392
"upload_to_base_bucket": "no",
393393
"stable_version": "2.13.0"
@@ -471,7 +471,7 @@
471471
"package_type": "manywheel",
472472
"build_name": "manywheel-py3_14-rocm7_2",
473473
"validation_runner": "linux.2xlarge",
474-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
474+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
475475
"channel": "nightly",
476476
"upload_to_base_bucket": "no",
477477
"stable_version": "2.13.0"
@@ -485,7 +485,7 @@
485485
"package_type": "manywheel",
486486
"build_name": "manywheel-py3_14-rocm7_14",
487487
"validation_runner": "linux.2xlarge",
488-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
488+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
489489
"channel": "nightly",
490490
"upload_to_base_bucket": "no",
491491
"stable_version": "2.13.0"
@@ -569,7 +569,7 @@
569569
"package_type": "manywheel",
570570
"build_name": "manywheel-py3_14t-rocm7_2",
571571
"validation_runner": "linux.2xlarge",
572-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
572+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
573573
"channel": "nightly",
574574
"upload_to_base_bucket": "no",
575575
"stable_version": "2.13.0"
@@ -583,7 +583,7 @@
583583
"package_type": "manywheel",
584584
"build_name": "manywheel-py3_14t-rocm7_14",
585585
"validation_runner": "linux.2xlarge",
586-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
586+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
587587
"channel": "nightly",
588588
"upload_to_base_bucket": "no",
589589
"stable_version": "2.13.0"

‎tools/tests/assets/build_matrix_linux_wheel_nocpu.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"package_type": "manywheel",
6666
"build_name": "manywheel-py3_10-rocm7_2",
6767
"validation_runner": "linux.2xlarge",
68-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
68+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
6969
"channel": "nightly",
7070
"upload_to_base_bucket": "no",
7171
"stable_version": "2.13.0"
@@ -79,7 +79,7 @@
7979
"package_type": "manywheel",
8080
"build_name": "manywheel-py3_10-rocm7_14",
8181
"validation_runner": "linux.2xlarge",
82-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
82+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
8383
"channel": "nightly",
8484
"upload_to_base_bucket": "no",
8585
"stable_version": "2.13.0"
@@ -149,7 +149,7 @@
149149
"package_type": "manywheel",
150150
"build_name": "manywheel-py3_11-rocm7_2",
151151
"validation_runner": "linux.2xlarge",
152-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
152+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
153153
"channel": "nightly",
154154
"upload_to_base_bucket": "no",
155155
"stable_version": "2.13.0"
@@ -163,7 +163,7 @@
163163
"package_type": "manywheel",
164164
"build_name": "manywheel-py3_11-rocm7_14",
165165
"validation_runner": "linux.2xlarge",
166-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
166+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
167167
"channel": "nightly",
168168
"upload_to_base_bucket": "no",
169169
"stable_version": "2.13.0"
@@ -233,7 +233,7 @@
233233
"package_type": "manywheel",
234234
"build_name": "manywheel-py3_12-rocm7_2",
235235
"validation_runner": "linux.2xlarge",
236-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
236+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
237237
"channel": "nightly",
238238
"upload_to_base_bucket": "no",
239239
"stable_version": "2.13.0"
@@ -247,7 +247,7 @@
247247
"package_type": "manywheel",
248248
"build_name": "manywheel-py3_12-rocm7_14",
249249
"validation_runner": "linux.2xlarge",
250-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
250+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
251251
"channel": "nightly",
252252
"upload_to_base_bucket": "no",
253253
"stable_version": "2.13.0"
@@ -317,7 +317,7 @@
317317
"package_type": "manywheel",
318318
"build_name": "manywheel-py3_13-rocm7_2",
319319
"validation_runner": "linux.2xlarge",
320-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
320+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
321321
"channel": "nightly",
322322
"upload_to_base_bucket": "no",
323323
"stable_version": "2.13.0"
@@ -331,7 +331,7 @@
331331
"package_type": "manywheel",
332332
"build_name": "manywheel-py3_13-rocm7_14",
333333
"validation_runner": "linux.2xlarge",
334-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
334+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
335335
"channel": "nightly",
336336
"upload_to_base_bucket": "no",
337337
"stable_version": "2.13.0"
@@ -401,7 +401,7 @@
401401
"package_type": "manywheel",
402402
"build_name": "manywheel-py3_14-rocm7_2",
403403
"validation_runner": "linux.2xlarge",
404-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
404+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
405405
"channel": "nightly",
406406
"upload_to_base_bucket": "no",
407407
"stable_version": "2.13.0"
@@ -415,7 +415,7 @@
415415
"package_type": "manywheel",
416416
"build_name": "manywheel-py3_14-rocm7_14",
417417
"validation_runner": "linux.2xlarge",
418-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
418+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
419419
"channel": "nightly",
420420
"upload_to_base_bucket": "no",
421421
"stable_version": "2.13.0"
@@ -485,7 +485,7 @@
485485
"package_type": "manywheel",
486486
"build_name": "manywheel-py3_14t-rocm7_2",
487487
"validation_runner": "linux.2xlarge",
488-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
488+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.2",
489489
"channel": "nightly",
490490
"upload_to_base_bucket": "no",
491491
"stable_version": "2.13.0"
@@ -499,7 +499,7 @@
499499
"package_type": "manywheel",
500500
"build_name": "manywheel-py3_14t-rocm7_14",
501501
"validation_runner": "linux.2xlarge",
502-
"installation": "pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
502+
"installation": "pip3 install --pre torchvision torch --index-url https://download.pytorch.org/whl/nightly/rocm7.14",
503503
"channel": "nightly",
504504
"upload_to_base_bucket": "no",
505505
"stable_version": "2.13.0"

0 commit comments

Comments
 (0)