From 4bc65484e879a367dac360b3b8afc960fdf20a88 Mon Sep 17 00:00:00 2001 From: atalman Date: Fri, 6 Oct 2023 07:36:21 -0700 Subject: [PATCH 1/4] Validate poetry for release --- .github/workflows/validate-linux-binaries.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 12335e843..3c5aac2eb 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -68,11 +68,8 @@ jobs: eval "$(conda shell.bash hook)" # 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" ]] || \ - [[ ${MATRIX_GPU_ARCH_VERSION} == "11.7" && ${MATRIX_CHANNEL} == "release" ]]); then + if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then source ./.github/scripts/validate_pipy.sh - # temporary disable poetry check source ./.github/scripts/validate_poetry.sh fi From f45313c1a7a34cfd30bcdae1af65f4a474abf926 Mon Sep 17 00:00:00 2001 From: atalman Date: Fri, 6 Oct 2023 08:05:59 -0700 Subject: [PATCH 2/4] test --- .github/scripts/validate_poetry.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/validate_poetry.sh b/.github/scripts/validate_poetry.sh index c4e4fd154..2a2490265 100644 --- a/.github/scripts/validate_poetry.sh +++ b/.github/scripts/validate_poetry.sh @@ -26,10 +26,12 @@ if [[ ${MATRIX_CHANNEL} != "release" ]]; then fi else export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring + poetry source add --priority=explicit domains "https://download.pytorch.org/whl/${MATRIX_DESIRED_CUDA}" + poetry source add --priority=supplemental pytorch "https://download.pytorch.org/whl/" if [[ ${TORCH_ONLY} == 'true' ]]; then poetry --quiet add torch else - poetry --quiet add torch torchaudio torchvision + poetry --quiet add --source pytorch torch torchaudio torchvision fi fi From 5acef63f050aeca8bc1dcb67ec4b917b4118ccc5 Mon Sep 17 00:00:00 2001 From: atalman Date: Fri, 6 Oct 2023 08:30:04 -0700 Subject: [PATCH 3/4] test --- .github/scripts/validate_poetry.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/validate_poetry.sh b/.github/scripts/validate_poetry.sh index 2a2490265..4daaba162 100644 --- a/.github/scripts/validate_poetry.sh +++ b/.github/scripts/validate_poetry.sh @@ -26,8 +26,7 @@ if [[ ${MATRIX_CHANNEL} != "release" ]]; then fi else export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring - poetry source add --priority=explicit domains "https://download.pytorch.org/whl/${MATRIX_DESIRED_CUDA}" - poetry source add --priority=supplemental pytorch "https://download.pytorch.org/whl/" + poetry source add --priority=explicit pythorch "https://download.pytorch.org/whl/${MATRIX_DESIRED_CUDA}" if [[ ${TORCH_ONLY} == 'true' ]]; then poetry --quiet add torch else From 37a566e5388c34333c406e337264c8ee815040f9 Mon Sep 17 00:00:00 2001 From: atalman Date: Fri, 6 Oct 2023 09:04:12 -0700 Subject: [PATCH 4/4] fixtypo --- .github/scripts/validate_poetry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate_poetry.sh b/.github/scripts/validate_poetry.sh index 4daaba162..3c41d5b45 100644 --- a/.github/scripts/validate_poetry.sh +++ b/.github/scripts/validate_poetry.sh @@ -26,7 +26,7 @@ if [[ ${MATRIX_CHANNEL} != "release" ]]; then fi else export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring - poetry source add --priority=explicit pythorch "https://download.pytorch.org/whl/${MATRIX_DESIRED_CUDA}" + poetry source add --priority=explicit pytorch "https://download.pytorch.org/whl/${MATRIX_DESIRED_CUDA}" if [[ ${TORCH_ONLY} == 'true' ]]; then poetry --quiet add torch else