Test poetry validation

Author: atalman

.github/scripts/validate_pipy.sh

@@ -1,10 +1,12 @@
 conda create -yp ${ENV_NAME}_pypi python=${MATRIX_PYTHON_VERSION} numpy ffmpeg
-#INSTALLATION_PYPI=${MATRIX_INSTALLATION/"cu117"/"cu117_pypi_cudnn"}
-#INSTALLATION_PYPI=${INSTALLATION_PYPI/"index-url"/"extra-index-url"}
-conda run -p ${ENV_NAME}_pypi ${PYPI_INSTALL_1}
-if [ ! -z "${PYPI_INSTALL_2:-}" ]; then
-    conda run -p ${ENV_NAME}_pypi ${PYPI_INSTALL_2}
+
+if [[ ${MATRIX_CHANNEL} != "release" ]]; then
+    conda run -p ${ENV_NAME}_pypi pip3 install --pre torch --index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
+    conda run -p ${ENV_NAME}_pypi pip3 install --pre torchvision torchaudio --index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}"
+else
+    conda run -p ${ENV_NAME}_pypi pip3 install torch torchvision torchaudio
 fi
+
 conda run -p ${ENV_NAME}_pypi python ./test/smoke_test/smoke_test.py
 conda deactivate
 conda env remove -p ${ENV_NAME}_pypi

.github/scripts/validate_poetry.sh

@@ -9,16 +9,16 @@ poetry new test_poetry
 cd test_poetry
 
 if [[ ${MATRIX_CHANNEL} != "release" ]]; then
-    # Installing poetry from our custom repo. We need to configure it before use
+    # Installing poetry from our custom repo. We need to configure it before use and disable authentication
     export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
     poetry source add --priority=explicit domains "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}"
     poetry source add --priority=explicit pytorch "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
+    poetry --quiet add --source pytorch torch
+    poetry --quiet add --source domains torchvision torchaudio
+else
+    poetry --quiet add torch torchaudio torchvision
 fi
 
-eval $POETRY_INSTALL_1
-if [[ ! -z "${POETRY_INSTALL_2:-}" ]]; then
-    eval $POETRY_INSTALL_2
-fi
 python ../test/smoke_test/smoke_test.py
 conda deactivate
 conda env remove -p ${ENV_NAME}_poetry

.github/workflows/validate-linux-binaries.yml

@@ -57,22 +57,11 @@ jobs:
         eval "$(conda shell.bash hook)"
 
         # Special case PyPi installation package. And Install of PyPi package via poetry
-        # For release we use CUDA 11.7 and for Nightly CUDA 12.1 - todo set the install commands
-        if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" ]]; then
-
-          if [[ ${MATRIX_GPU_ARCH_VERSION} == "12.1" && ${MATRIX_CHANNEL} != "release" ]]; then
-            export PYPI_INSTALL_1="pip3 install --pre torch --index-url https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
-            export PYPI_INSTALL_2="pip3 install --pre torchvision torchaudio --index-url https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}"
-            export POETRY_INSTALL_1="poetry add --source pytorch torch"
-            export POETRY_INSTALL_2="poetry add --source domains torchvision torchaudio"
-          elif [[ ${MATRIX_GPU_ARCH_VERSION} == "11.7" && ${MATRIX_CHANNEL} == "release" ]]; then
-            export PYPI_INSTALL_1="pip3 install torch torchvision torchaudio"
-            export POETRY_INSTALL_1="poetry --quiet add torch torchaudio torchvision"
-          fi
-
-          if [ ! -z "${PYPI_INSTALL_1:-}" ]; then
-            source ./.github/scripts/validate_pipy.sh
-            source ./.github/scripts/validate_poetry.sh
-          fi
+        if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" ]] && \
+           [[ ${MATRIX_GPU_ARCH_VERSION} == "12.1" && ${MATRIX_CHANNEL} != "release" ] || \
+            [ ${MATRIX_GPU_ARCH_VERSION} == "11.7" && ${MATRIX_CHANNEL} == "release" ]]; then
+          source ./.github/scripts/validate_pipy.sh
+          source ./.github/scripts/validate_poetry.sh
         fi
+
         source ./.github/scripts/validate_binaries.sh