From 76bd7cf1c347d4ec0462226299073675efffa650 Mon Sep 17 00:00:00 2001
From: Eli Uriegas <1700823+seemethere@users.noreply.github.com>
Date: Thu, 27 Oct 2022 13:54:10 -0700
Subject: [PATCH] release: separate out version suffixes for torch pypi
 promotion (#1179)

---
 release/pypi/prep_binary_for_pypi.sh    | 25 ++++++++++++++-----------
 release/pypi/promote_pypi_to_staging.sh | 13 +++++++------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/release/pypi/prep_binary_for_pypi.sh b/release/pypi/prep_binary_for_pypi.sh
index eaaa69815..b198bd567 100644
--- a/release/pypi/prep_binary_for_pypi.sh
+++ b/release/pypi/prep_binary_for_pypi.sh
@@ -63,17 +63,20 @@ for whl_file in "$@"; do
         mv "${dist_info_folder}" "${dirname_dist_info_folder}/${basename_dist_info_folder/${version_with_suffix}/${version_no_suffix}}"
         cd "${whl_dir}"
 
-        # copied from manywheel/build_common.sh
-        # regenerate the RECORD file with new hashes
-        record_file="${dirname_dist_info_folder}/${basename_dist_info_folder/${version_with_suffix}/${version_no_suffix}}/RECORD"
-        if [[ -e $record_file ]]; then
-            echo "Generating new record file $record_file"
-            rm -f $record_file
-            # generate records for folders in wheel
-            find * -type f | while read fname; do
-                echo $(make_wheel_record $fname) >>$record_file
-            done
-        fi
+        (
+            set +x
+            # copied from manywheel/build_common.sh
+            # regenerate the RECORD file with new hashes
+            record_file="${dirname_dist_info_folder}/${basename_dist_info_folder/${version_with_suffix}/${version_no_suffix}}/RECORD"
+            if [[ -e $record_file ]]; then
+                echo "Generating new record file $record_file"
+                rm -f $record_file
+                # generate records for folders in wheel
+                find * -type f | while read fname; do
+                    echo $(make_wheel_record $fname) >>$record_file
+                done
+            fi
+        )
 
         zip -qr "${new_whl_file}" .
     )
diff --git a/release/pypi/promote_pypi_to_staging.sh b/release/pypi/promote_pypi_to_staging.sh
index 02ebe4833..74f139680 100644
--- a/release/pypi/promote_pypi_to_staging.sh
+++ b/release/pypi/promote_pypi_to_staging.sh
@@ -21,16 +21,17 @@ upload_pypi_to_staging() {
 }
 
 # Uncomment these to promote to pypi
-LINUX_VERSION_SUFFIX="%2Bcu102"
+PYTORCH_LINUX_VERSION_SUFFIX="%2Bcu117.with.pypi.cudnn"
+LINUX_VERSION_SUFFIX="%2Bcu117"
 WIN_VERSION_SUFFIX="%2Bcpu"
 MACOS_X86_64="macosx_.*_x86_64"
 MACOS_ARM64="macosx_.*_arm64"
 
-PLATFORM="linux_x86_64"          VERSION_SUFFIX="${LINUX_VERSION_SUFFIX}" upload_pypi_to_staging torch "${PYTORCH_VERSION}"
-PLATFORM="manylinux2014_aarch64" VERSION_SUFFIX=""                        upload_pypi_to_staging torch "${PYTORCH_VERSION}"
-PLATFORM="win_amd64"             VERSION_SUFFIX="${WIN_VERSION_SUFFIX}"   upload_pypi_to_staging torch "${PYTORCH_VERSION}"
-PLATFORM="${MACOS_X86_64}"       VERSION_SUFFIX=""                        upload_pypi_to_staging torch "${PYTORCH_VERSION}" # intel mac
-PLATFORM="${MACOS_ARM64}"        VERSION_SUFFIX=""                        upload_pypi_to_staging torch "${PYTORCH_VERSION}" # m1 mac
+PLATFORM="linux_x86_64"          VERSION_SUFFIX="${PYTORCH_LINUX_VERSION_SUFFIX}" upload_pypi_to_staging torch "${PYTORCH_VERSION}"
+PLATFORM="manylinux2014_aarch64" VERSION_SUFFIX=""                                upload_pypi_to_staging torch "${PYTORCH_VERSION}"
+PLATFORM="win_amd64"             VERSION_SUFFIX="${WIN_VERSION_SUFFIX}"           upload_pypi_to_staging torch "${PYTORCH_VERSION}"
+PLATFORM="${MACOS_X86_64}"       VERSION_SUFFIX=""                                upload_pypi_to_staging torch "${PYTORCH_VERSION}" # intel mac
+PLATFORM="${MACOS_ARM64}"        VERSION_SUFFIX=""                                upload_pypi_to_staging torch "${PYTORCH_VERSION}" # m1 mac
 
 PLATFORM="linux_x86_64"          VERSION_SUFFIX="${LINUX_VERSION_SUFFIX}" upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}"
 PLATFORM="manylinux2014_aarch64" VERSION_SUFFIX=""                        upload_pypi_to_staging torchvision "${TORCHVISION_VERSION}"