From 2bbdbf2987ffc956cf4bcd4c770bce8cd95c8803 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 8 Apr 2025 12:41:28 -0700 Subject: [PATCH 1/6] Remove pre-cxx-abi mention --- scripts/gen_quick_start_module.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/gen_quick_start_module.py b/scripts/gen_quick_start_module.py index a3ceb1a35bc3..3e52328220e7 100755 --- a/scripts/gen_quick_start_module.py +++ b/scripts/gen_quick_start_module.py @@ -24,7 +24,6 @@ class OperatingSystem(Enum): MACOS: str = "macos" -PRE_CXX11_ABI = "pre-cxx11" CXX11_ABI = "cxx11-abi" DEBUG = "debug" RELEASE = "release" @@ -57,8 +56,7 @@ class OperatingSystem(Enum): acc_arch_ver_map = acc_arch_ver_default LIBTORCH_DWNL_INSTR = { - PRE_CXX11_ABI: "Download here (Pre-cxx11 ABI):", - CXX11_ABI: "Download here (cxx11 ABI):", + CXX11_ABI: "Download here:", RELEASE: "Download here (Release version):", DEBUG: "Download here (Debug version):", MACOS: "Download arm64 libtorch here (ROCm and CUDA are not supported):", @@ -157,13 +155,10 @@ def update_versions(versions, release_matrix, release_version): if x["libtorch_variant"] == "shared-with-deps" } if instr["versions"] is not None: - for ver in [PRE_CXX11_ABI, CXX11_ABI]: - if gpu_arch_type == "rocm" and ver == PRE_CXX11_ABI: - continue - else: - instr["versions"][LIBTORCH_DWNL_INSTR[ver]] = ( - rel_entry_dict[ver] - ) + for ver in [CXX11_ABI]: + instr["versions"][LIBTORCH_DWNL_INSTR[ver]] = ( + rel_entry_dict[ver] + ) elif os_key == OperatingSystem.WINDOWS.value: rel_entry_dict = { From 54db73027389abb81e26399dfbc8637cbdd90736 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 8 Apr 2025 13:00:17 -0700 Subject: [PATCH 2/6] remove from nightly --- published_versions.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/published_versions.json b/published_versions.json index 61dc537dfc35..386f493d55ce 100644 --- a/published_versions.json +++ b/published_versions.json @@ -52,35 +52,31 @@ "accnone": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-shared-with-deps-latest.zip", - "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here:": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.x": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-shared-with-deps-latest.zip", - "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here:": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.y": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-shared-with-deps-latest.zip", - "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here:": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.z": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-shared-with-deps-latest.zip", - "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here:": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "rocm5.x": { "note": null, "versions": { - "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/rocm6.3/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here:": "https://download.pytorch.org/libtorch/nightly/rocm6.3/libtorch-cxx11-abi-shared-with-deps-latest.zip" } } } @@ -5863,4 +5859,4 @@ } } } -} \ No newline at end of file +} From f9b41d5b5269731fc8b9547e8603149536bfba3f Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 8 Apr 2025 13:31:53 -0700 Subject: [PATCH 3/6] Revert "remove from nightly" This reverts commit 54db73027389abb81e26399dfbc8637cbdd90736. --- published_versions.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/published_versions.json b/published_versions.json index 386f493d55ce..61dc537dfc35 100644 --- a/published_versions.json +++ b/published_versions.json @@ -52,31 +52,35 @@ "accnone": { "note": null, "versions": { - "Download here:": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-shared-with-deps-latest.zip", + "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.x": { "note": null, "versions": { - "Download here:": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-shared-with-deps-latest.zip", + "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.y": { "note": null, "versions": { - "Download here:": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-shared-with-deps-latest.zip", + "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.z": { "note": null, "versions": { - "Download here:": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-shared-with-deps-latest.zip", + "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "rocm5.x": { "note": null, "versions": { - "Download here:": "https://download.pytorch.org/libtorch/nightly/rocm6.3/libtorch-cxx11-abi-shared-with-deps-latest.zip" + "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/rocm6.3/libtorch-cxx11-abi-shared-with-deps-latest.zip" } } } @@ -5859,4 +5863,4 @@ } } } -} +} \ No newline at end of file From 54041872f8d3d4391c5f5d459f37f6736639d907 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 8 Apr 2025 13:34:50 -0700 Subject: [PATCH 4/6] fixes --- published_versions.json | 6 +----- scripts/gen_quick_start_module.py | 15 ++++++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/published_versions.json b/published_versions.json index 61dc537dfc35..d74f7543c960 100644 --- a/published_versions.json +++ b/published_versions.json @@ -52,28 +52,24 @@ "accnone": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-shared-with-deps-latest.zip", "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.x": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-shared-with-deps-latest.zip", "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu118/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.y": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-shared-with-deps-latest.zip", "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu126/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, "cuda.z": { "note": null, "versions": { - "Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-shared-with-deps-latest.zip", "Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu128/libtorch-cxx11-abi-shared-with-deps-latest.zip" } }, @@ -5863,4 +5859,4 @@ } } } -} \ No newline at end of file +} diff --git a/scripts/gen_quick_start_module.py b/scripts/gen_quick_start_module.py index 3e52328220e7..fb3b0442da81 100755 --- a/scripts/gen_quick_start_module.py +++ b/scripts/gen_quick_start_module.py @@ -24,6 +24,7 @@ class OperatingSystem(Enum): MACOS: str = "macos" +PRE_CXX11_ABI = "pre-cxx11" CXX11_ABI = "cxx11-abi" DEBUG = "debug" RELEASE = "release" @@ -56,7 +57,7 @@ class OperatingSystem(Enum): acc_arch_ver_map = acc_arch_ver_default LIBTORCH_DWNL_INSTR = { - CXX11_ABI: "Download here:", + CXX11_ABI: "Download here (cxx11 ABI):", RELEASE: "Download here (Release version):", DEBUG: "Download here (Debug version):", MACOS: "Download arm64 libtorch here (ROCm and CUDA are not supported):", @@ -155,10 +156,14 @@ def update_versions(versions, release_matrix, release_version): if x["libtorch_variant"] == "shared-with-deps" } if instr["versions"] is not None: - for ver in [CXX11_ABI]: - instr["versions"][LIBTORCH_DWNL_INSTR[ver]] = ( - rel_entry_dict[ver] - ) + for ver in [CXX11_ABI, PRE_CXX11_ABI]: + # temporarily apply removal of cxx11 abi only to nightly + if ver == PRE_CXX11_ABI and release_version == "nightly": + continue + else: + instr["versions"][LIBTORCH_DWNL_INSTR[ver]] = ( + rel_entry_dict[ver] + ) elif os_key == OperatingSystem.WINDOWS.value: rel_entry_dict = { From af7373870e0b22b9b4ce3846fd7872579e032cd2 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 8 Apr 2025 13:36:46 -0700 Subject: [PATCH 5/6] fix --- scripts/gen_quick_start_module.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/gen_quick_start_module.py b/scripts/gen_quick_start_module.py index fb3b0442da81..9e3d2de507b8 100755 --- a/scripts/gen_quick_start_module.py +++ b/scripts/gen_quick_start_module.py @@ -57,6 +57,7 @@ class OperatingSystem(Enum): acc_arch_ver_map = acc_arch_ver_default LIBTORCH_DWNL_INSTR = { + PRE_CXX11_ABI: "Download here (Pre-cxx11 ABI):", CXX11_ABI: "Download here (cxx11 ABI):", RELEASE: "Download here (Release version):", DEBUG: "Download here (Debug version):", From 122ce4048c4c344b286126ac0b5d7082afac5330 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 8 Apr 2025 13:38:37 -0700 Subject: [PATCH 6/6] fix --- scripts/gen_quick_start_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gen_quick_start_module.py b/scripts/gen_quick_start_module.py index 9e3d2de507b8..a1389179883f 100755 --- a/scripts/gen_quick_start_module.py +++ b/scripts/gen_quick_start_module.py @@ -158,8 +158,8 @@ def update_versions(versions, release_matrix, release_version): } if instr["versions"] is not None: for ver in [CXX11_ABI, PRE_CXX11_ABI]: - # temporarily apply removal of cxx11 abi only to nightly - if ver == PRE_CXX11_ABI and release_version == "nightly": + # temporarily apply removal of cxx11 abi only to nightly and rocm builds + if ver == PRE_CXX11_ABI and (release_version == "nightly" or gpu_arch_type == "rocm"): continue else: instr["versions"][LIBTORCH_DWNL_INSTR[ver]] = (