From bfca402369c36d1e3f8a8623eafdcdadafd09856 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Mon, 11 Dec 2023 13:56:11 -0800
Subject: [PATCH 1/2] Revert "Validate pypi build only for release (#1624)"

This reverts commit 56556d0aaca4da61c0497608b9136b058573c8d6.
---
 .github/workflows/validate-linux-binaries.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml
index d1c6c29bd..1b84eaa31 100644
--- a/.github/workflows/validate-linux-binaries.yml
+++ b/.github/workflows/validate-linux-binaries.yml
@@ -88,9 +88,10 @@ jobs:
         export TARGET_OS="linux"
         eval "$(conda shell.bash hook)"
         printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
+        cat release_matrix.json
 
         # Special case PyPi installation package. And Install of PyPi package via poetry
-        if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" && ${MATRIX_CHANNEL} == "release" ]]; then
+        if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" && ${MATRIX_CHANNEL} == "release"]]; then
           source ./.github/scripts/validate_pipy.sh
           source ./.github/scripts/validate_poetry.sh
         fi

From f967d28c7e236cd99b6d305ecc556e97e914b5ec Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Mon, 11 Dec 2023 13:56:30 -0800
Subject: [PATCH 2/2] Revert "Validate pypi build only for release (#1623)"

This reverts commit 4db3d68b5a4c3b87148ba394d31960ff805c3850.
---
 .github/scripts/validate_pipy.sh              | 9 +++++++--
 .github/workflows/validate-linux-binaries.yml | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/validate_pipy.sh b/.github/scripts/validate_pipy.sh
index 5858e4c28..d7a930899 100644
--- a/.github/scripts/validate_pipy.sh
+++ b/.github/scripts/validate_pipy.sh
@@ -10,9 +10,14 @@ fi
 
 if [[ ${TORCH_ONLY} == 'true' ]]; then
     TEST_SUFFIX=" --package torchonly"
-    pip3 install torch${RELEASE_SUFFIX}
+    pip3 install --pre torch${RELEASE_SUFFIX} --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
 else
-    pip3 install torch${RELEASE_SUFFIX} torchvision torchaudio
+    if [[ ${MATRIX_CHANNEL} != "release" ]]; then
+        pip3 install --pre torch${RELEASE_SUFFIX}  --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
+        pip3 install --pre torchvision torchaudio --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}"
+    else
+        pip3 install torch${RELEASE_SUFFIX}  torchvision torchaudio
+    fi
 fi
 
 python ./test/smoke_test/smoke_test.py ${TEST_SUFFIX} --runtime-error-check disabled
diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml
index 1b84eaa31..aedffeef2 100644
--- a/.github/workflows/validate-linux-binaries.yml
+++ b/.github/workflows/validate-linux-binaries.yml
@@ -91,9 +91,12 @@ jobs:
         cat release_matrix.json
 
         # Special case PyPi installation package. And Install of PyPi package via poetry
-        if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" && ${MATRIX_CHANNEL} == "release"]]; then
+        if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then
           source ./.github/scripts/validate_pipy.sh
-          source ./.github/scripts/validate_poetry.sh
+
+          if [[ ${MATRIX_CHANNEL} == "release" ]]; then
+            source ./.github/scripts/validate_poetry.sh
+          fi
         fi
 
         # Standart case: Validate binaries