Skip to content

Commit 97abda2

Browse files
atalmanatalman
committed
Release pypi prep change (#1587)
* [aarch64] Release pypi prep script change for aarch64 builds * Release versions for testing Testing calling version (#1588) Upstream/release validations (#1589) * Testing calling version * add release matrix Upstream/release validations (#1590) * Testing calling version * add release matrix * test test (#1591) test (#1592) Release v1 (#1595) * test * test Release v1 (#1596) * test * test * test test (#1597) Test versions validations (#1598) * test * basedir Test versions validations (#1599) * test * basedir * test test (#1600) * test * test Add release versions everywhere (#1601) * test * test * test * test test (#1602) Test version validations (#1603) * test * test Test version validations (#1604) * test * test * test tests (#1605) More tests nov16 (#1606) * tests * test More tests nov16 (#1607) * tests * test * test More tests nov16 (#1608) * tests * test * test * test More tests nov16 (#1609) * tests * test * test * test * test test poetry_fix test test Changes needed for core enablement of 3.12 binary wheels (#1586) Fix aarch64 build on 3.8 (#1593) Add some more validation checks for torch.linalg.eigh and torch.compile (#1580) * Add some more validation checks for torch.linalg.eigh and torch.compile * Update test * Also update smoke_test.py * Fix lint Revert "Add some more validation checks for torch.linalg.eigh and torch.compile (#1580)" (#1594) This reverts commit 4c7fa06. Release validations using release version matrix (#1611) * Release pypi prep change (#1587) * [aarch64] Release pypi prep script change for aarch64 builds * Release versions for testing Testing calling version (#1588) Upstream/release validations (#1589) * Testing calling version * add release matrix Upstream/release validations (#1590) * Testing calling version * add release matrix * test test (#1591) test (#1592) Release v1 (#1595) * test * test Release v1 (#1596) * test * test * test test (#1597) Test versions validations (#1598) * test * basedir Test versions validations (#1599) * test * basedir * test test (#1600) * test * test Add release versions everywhere (#1601) * test * test * test * test test (#1602) Test version validations (#1603) * test * test Test version validations (#1604) * test * test * test tests (#1605) More tests nov16 (#1606) * tests * test More tests nov16 (#1607) * tests * test * test More tests nov16 (#1608) * tests * test * test * test More tests nov16 (#1609) * tests * test * test * test * test * fix_lint fix: typo (#1581) desired_cuda -> DESIRED_CUDA (#1612) * desired_cuda -> DESIRED_CUDA Found with shellcheck * Update manywheel/build_cuda.sh Co-authored-by: Nikita Shulga <[email protected]> --------- Co-authored-by: Nikita Shulga <[email protected]> [BE] Cleanup build unused code (#1613) 1. Upload Scripts are not used anymore. We use Github Action upload workflows 2. M1 Builds are now automated 3. build_all.bat run git grep in pytorch and builder - No result Changes to pypi release promotion scripts introduced for 2.1.0 and 2.1.1 (#1614) * Changes topypi release promotion scripts introduced during 2.1.1 * typo Pin miniconda version for Windows To Miniconda3-py311_23.9.0-0-Windows-x86_64.exe
1 parent 75a8770 commit 97abda2

26 files changed

+251
-265
lines changed

‎.github/scripts/validate_pipy.sh

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@ conda create -yn ${ENV_NAME}_pypi python=${MATRIX_PYTHON_VERSION} numpy ffmpeg
22
conda activate ${ENV_NAME}_pypi
33

44
TEST_SUFFIX=""
5+
RELEASE_SUFFIX=""
6+
# if RELESE version is passed as parameter - install speific version
7+
if [[ ! -z ${RELEASE_VERSION} ]]; then
8+
RELEASE_SUFFIX="==${RELEASE_VERSION}"
9+
fi
10+
511
if [[ ${TORCH_ONLY} == 'true' ]]; then
612
TEST_SUFFIX=" --package torchonly"
7-
pip3 install --pre torch --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
13+
pip3 install --pre torch${RELEASE_SUFFIX} --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
814
else
915
if [[ ${MATRIX_CHANNEL} != "release" ]]; then
10-
pip3 install --pre torch --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
16+
pip3 install --pre torch${RELEASE_SUFFIX} --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
1117
pip3 install --pre torchvision torchaudio --extra-index-url "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}"
1218
else
13-
pip3 install torch torchvision torchaudio
19+
pip3 install torch${RELEASE_SUFFIX} torchvision torchaudio
1420
fi
1521
fi
1622

‎.github/scripts/validate_poetry.sh

+9-17
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,17 @@ if [[ ${TORCH_ONLY} == 'true' ]]; then
1313
TEST_SUFFIX=" --package torchonly"
1414
fi
1515

16-
if [[ ${MATRIX_CHANNEL} != "release" ]]; then
17-
# Installing poetry from our custom repo. We need to configure it before use and disable authentication
18-
export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
19-
poetry source add --priority=explicit domains "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}"
20-
poetry source add --priority=supplemental pytorch-channel "https://download.pytorch.org/whl/${MATRIX_CHANNEL}"
21-
poetry source add --priority=supplemental pytorch "https://download.pytorch.org/whl/${MATRIX_CHANNEL}/${MATRIX_DESIRED_CUDA}_pypi_cudnn"
22-
poetry --quiet add --source pytorch torch
16+
RELEASE_SUFFIX=""
17+
# if RELESE version is passed as parameter - install speific version
18+
if [[ ! -z ${RELEASE_VERSION} ]]; then
19+
RELEASE_SUFFIX="@${RELEASE_VERSION}"
20+
fi
21+
2322

24-
if [[ ${TORCH_ONLY} != 'true' ]]; then
25-
poetry --quiet add --source domains torchvision torchaudio
26-
fi
23+
if [[ ${TORCH_ONLY} == 'true' ]]; then
24+
poetry --quiet add torch${RELEASE_SUFFIX}
2725
else
28-
export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
29-
poetry source add --priority=explicit pytorch "https://download.pytorch.org/whl/${MATRIX_DESIRED_CUDA}"
30-
if [[ ${TORCH_ONLY} == 'true' ]]; then
31-
poetry --quiet add torch
32-
else
33-
poetry --quiet add --source pytorch torch torchaudio torchvision
34-
fi
26+
poetry --quiet add torch${RELEASE_SUFFIX} torchaudio torchvision
3527
fi
3628

3729
python ../test/smoke_test/smoke_test.py ${TEST_SUFFIX} --runtime-error-check disabled

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

+22-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ on:
1717
default: false
1818
required: false
1919
type: boolean
20+
version:
21+
description: 'Version to validate - optional'
22+
default: ""
23+
required: false
24+
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2030
workflow_dispatch:
2131
inputs:
2232
channel:
@@ -38,6 +48,16 @@ on:
3848
default: false
3949
required: false
4050
type: boolean
51+
version:
52+
description: 'Version to validate - optional'
53+
default: ""
54+
required: false
55+
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
4161

4262
jobs:
4363
generate-aarch64-linux-matrix:
@@ -47,7 +67,6 @@ jobs:
4767
os: linux-aarch64
4868
channel: ${{ inputs.channel }}
4969
with-cuda: disable
50-
5170
linux-aarch64:
5271
needs: generate-aarch64-linux-matrix
5372
strategy:
@@ -72,6 +91,8 @@ jobs:
7291
export ENV_NAME="conda-env-${{ github.run_id }}"
7392
export TARGET_OS="linux-aarch64"
7493
export TORCH_ONLY=${{ inputs.torchonly }}
94+
export RELEASE_VERSION=${{ inputs.version }}
95+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
7596
eval "$(conda shell.bash hook)"
7697
7798
# Standart case: Validate binaries

‎.github/workflows/validate-binaries.yml

+26-1
Original file line numberDiff line numberDiff line change
@@ -60,44 +60,69 @@ on:
6060
default: false
6161
required: false
6262
type: boolean
63+
version:
64+
description: 'Version to validate'
65+
default: ""
66+
required: false
67+
type: string
68+
6369

6470
jobs:
71+
generate-release-matrix:
72+
uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main
73+
with:
74+
version: ${{ inputs.version }}
75+
6576
win:
6677
if: inputs.os == 'windows' || inputs.os == 'all'
78+
needs: generate-release-matrix
6779
uses: ./.github/workflows/validate-windows-binaries.yml
6880
with:
6981
channel: ${{ inputs.channel }}
7082
ref: ${{ inputs.ref || github.ref }}
7183
torchonly: ${{ inputs.torchonly }}
84+
version: ${{ inputs.version }}
85+
release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }}
7286

7387
linux:
7488
if: inputs.os == 'linux' || inputs.os == 'all'
89+
needs: generate-release-matrix
7590
uses: ./.github/workflows/validate-linux-binaries.yml
7691
with:
7792
channel: ${{ inputs.channel }}
7893
ref: ${{ inputs.ref || github.ref }}
7994
torchonly: ${{ inputs.torchonly }}
95+
version: ${{ inputs.version }}
96+
release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }}
8097

8198
linux-aarch64:
8299
if: inputs.os == 'linux-aarch64'
100+
needs: generate-release-matrix
83101
uses: ./.github/workflows/validate-aarch64-linux-binaries.yml
84102
with:
85103
channel: ${{ inputs.channel }}
86104
ref: ${{ inputs.ref || github.ref }}
87105
torchonly: ${{ inputs.torchonly }}
88-
106+
version: ${{ inputs.version }}
107+
release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }}
89108
mac:
90109
if: inputs.os == 'macos' || inputs.os == 'all'
110+
needs: generate-release-matrix
91111
uses: ./.github/workflows/validate-macos-binaries.yml
92112
with:
93113
channel: ${{ inputs.channel }}
94114
ref: ${{ inputs.ref || github.ref }}
95115
torchonly: ${{ inputs.torchonly }}
116+
version: ${{ inputs.version }}
117+
release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }}
96118

97119
mac-arm64:
98120
if: inputs.os == 'macos' || inputs.os == 'all'
121+
needs: generate-release-matrix
99122
uses: ./.github/workflows/validate-macos-arm64-binaries.yml
100123
with:
101124
channel: ${{ inputs.channel }}
102125
ref: ${{ inputs.ref || github.ref }}
103126
torchonly: ${{ inputs.torchonly }}
127+
version: ${{ inputs.version }}
128+
release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }}

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

+23
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ on:
1717
default: false
1818
required: false
1919
type: boolean
20+
version:
21+
description: 'Version to validate - optional'
22+
default: ""
23+
required: false
24+
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2030
workflow_dispatch:
2131
inputs:
2232
channel:
@@ -38,6 +48,16 @@ on:
3848
default: false
3949
required: false
4050
type: boolean
51+
version:
52+
description: 'Version to validate - optional'
53+
default: ""
54+
required: false
55+
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
4161

4262
jobs:
4363
generate-linux-matrix:
@@ -64,8 +84,11 @@ jobs:
6484
set -ex
6585
export ENV_NAME="conda-env-${{ github.run_id }}"
6686
export TORCH_ONLY=${{ inputs.torchonly }}
87+
export RELEASE_VERSION=${{ inputs.version }}
6788
export TARGET_OS="linux"
6889
eval "$(conda shell.bash hook)"
90+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
91+
cat release_matrix.json
6992
7093
# Special case PyPi installation package. And Install of PyPi package via poetry
7194
if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then

‎.github/workflows/validate-macos-arm64-binaries.yml

+22
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ on:
1717
default: false
1818
required: false
1919
type: boolean
20+
version:
21+
description: 'Version to validate - optional'
22+
default: ""
23+
required: false
24+
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2030
workflow_dispatch:
2131
inputs:
2232
channel:
@@ -38,6 +48,16 @@ on:
3848
default: false
3949
required: false
4050
type: boolean
51+
version:
52+
description: 'Version to validate - optional'
53+
default: ""
54+
required: false
55+
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
4161

4262
jobs:
4363
generate-macos-arm64-matrix:
@@ -64,4 +84,6 @@ jobs:
6484
export ENV_NAME="conda-env-${{ github.run_id }}"
6585
export TARGET_OS="macos-arm64"
6686
export TORCH_ONLY=${{ inputs.torchonly }}
87+
export RELEASE_VERSION=${{ inputs.version }}
88+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
6789
source ./.github/scripts/validate_binaries.sh

‎.github/workflows/validate-macos-binaries.yml

+22
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ on:
1717
default: false
1818
required: false
1919
type: boolean
20+
version:
21+
description: 'Version to validate - optional'
22+
default: ""
23+
required: false
24+
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2030
workflow_dispatch:
2131
inputs:
2232
channel:
@@ -38,6 +48,16 @@ on:
3848
default: false
3949
required: false
4050
type: boolean
51+
version:
52+
description: 'Version to validate - optional'
53+
default: ""
54+
required: false
55+
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
4161

4262
jobs:
4363
generate-macos-matrix:
@@ -64,4 +84,6 @@ jobs:
6484
export ENV_NAME="conda-env-${{ github.run_id }}"
6585
export TARGET_OS="macos"
6686
export TORCH_ONLY=${{ inputs.torchonly }}
87+
export RELEASE_VERSION=${{ inputs.version }}
88+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
6789
source ./.github/scripts/validate_binaries.sh

‎.github/workflows/validate-windows-binaries.yml

+22-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ on:
1717
default: false
1818
required: false
1919
type: boolean
20+
version:
21+
description: 'Version to validate - optional'
22+
default: ""
23+
required: false
24+
type: string
25+
release-matrix:
26+
description: 'Release matrix - optional'
27+
default: ""
28+
required: false
29+
type: string
2030
workflow_dispatch:
2131
inputs:
2232
channel:
@@ -38,6 +48,16 @@ on:
3848
default: false
3949
required: false
4050
type: boolean
51+
version:
52+
description: 'Version to validate - optional'
53+
default: ""
54+
required: false
55+
type: string
56+
release-matrix:
57+
description: 'Release matrix - optional'
58+
default: ""
59+
required: false
60+
type: string
4161

4262
jobs:
4363
generate-windows-matrix:
@@ -46,7 +66,6 @@ jobs:
4666
package-type: all
4767
os: windows
4868
channel: ${{ inputs.channel }}
49-
5069
win:
5170
needs: generate-windows-matrix
5271
strategy:
@@ -66,9 +85,10 @@ jobs:
6685
export ENV_NAME="conda-env-${{ github.run_id }}"
6786
export TARGET_OS="windows"
6887
export TORCH_ONLY=${{ inputs.torchonly }}
88+
export RELEASE_VERSION=${{ inputs.version }}
89+
printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json
6990
source /c/Jenkins/Miniconda3/etc/profile.d/conda.sh
7091
if [[ ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then
7192
./windows/internal/driver_update.bat
7293
fi
73-
7494
source ./.github/scripts/validate_binaries.sh

‎aarch64_linux/aarch64_ci_setup.sh

+12-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,17 @@ curl -L -o /mambaforge.sh https://github.com/conda-forge/miniforge/releases/late
1919
chmod +x /mambaforge.sh
2020
/mambaforge.sh -b -p /opt/conda
2121
rm /mambaforge.sh
22-
/opt/conda/bin/conda config --set ssl_verify False
23-
/opt/conda/bin/conda install -y -c conda-forge python=${DESIRED_PYTHON} numpy pyyaml setuptools patchelf pygit2 openblas ninja scons
22+
source /opt/conda/etc/profile.d/conda.sh
23+
conda config --set ssl_verify False
24+
conda create -y -c conda-forge -n aarch64_env python=${DESIRED_PYTHON}
25+
conda activate aarch64_env
26+
27+
if [[ "$DESIRED_PYTHON" == "3.8" ]]; then
28+
NUMPY_VERSION="1.24.4"
29+
else
30+
NUMPY_VERSION="1.26.0"
31+
fi
32+
conda install -y -c conda-forge numpy==${NUMPY_VERSION} pyyaml==6.0.1 patchelf==0.17.2 pygit2==1.13.2 openblas==0.3.24 ninja==1.11.1 scons==4.5.2
33+
2434
python --version
2535
conda --version

0 commit comments

Comments
 (0)