Skip to content

Commit a81977d

Browse files
[RELEASE ONLY CHANGES] Use torch/audio/vision 2.11 release packages (#18418)
Now that torch/audio/vision were released, this switches from release candidates to torch 2.11 release packages for pytorch and domain libraries. See #16878 as example from the previous release.
1 parent cc5698a commit a81977d

8 files changed

Lines changed: 13 additions & 30 deletions

File tree

.ci/docker/common/install_pytorch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
1212

1313
install_domains() {
1414
echo "Install torchvision and torchaudio"
15-
pip_install --force-reinstall --no-cache-dir torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/test/cpu
15+
pip_install --force-reinstall --no-cache-dir torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/cpu
1616
}
1717

1818
install_pytorch_and_domains() {
19-
pip_install --force-reinstall --no-cache-dir torch==2.11.0 torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/test/cpu
19+
pip_install --force-reinstall --no-cache-dir torch==2.11.0 torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/cpu
2020
}
2121

2222
install_pytorch_and_domains

.ci/scripts/setup-linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ echo "Build tool: $BUILD_TOOL, Mode: $BUILD_MODE"
1717
# have already been installed, so we use PyTorch build from source here instead
1818
# of nightly. This allows CI to test against latest commits from PyTorch
1919
if [[ "${EDITABLE:-false}" == "true" ]]; then
20-
install_executorch --use-pt-pinned-commit --editable
20+
install_executorch --editable
2121
else
22-
install_executorch --use-pt-pinned-commit
22+
install_executorch
2323
fi
2424
build_executorch_runner "${BUILD_TOOL}" "${BUILD_MODE}"
2525

.ci/scripts/setup-macos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ install_pytorch_and_domains
130130
# We build PyTorch from source here instead of using nightly. This allows CI to test against
131131
# the pinned commit from PyTorch
132132
if [[ "$EDITABLE" == "true" ]]; then
133-
install_executorch --use-pt-pinned-commit --editable
133+
install_executorch --editable
134134
else
135-
install_executorch --use-pt-pinned-commit
135+
install_executorch
136136
fi
137137
build_executorch_runner "${BUILD_TOOL}" "${BUILD_MODE}"
138138

.ci/scripts/test_wheel_package_qnn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ PY
161161
echo "=== [$LABEL] Install torch==${TORCH_VERSION} ==="
162162

163163
# Install torchao based on the pinned PyTorch version
164-
"$PIPBIN" install --no-cache-dir torch=="${TORCH_VERSION}" --index-url "https://download.pytorch.org/whl/test/cpu"
164+
"$PIPBIN" install --no-cache-dir torch=="${TORCH_VERSION}" --index-url "https://download.pytorch.org/whl/cpu"
165165
"$PIPBIN" install wheel
166166

167167
# Install torchao based on the pinned commit from third-party/ao submodule

.ci/scripts/utils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ dedupe_macos_loader_path_rpaths() {
8484

8585
install_domains() {
8686
echo "Install torchvision and torchaudio"
87-
pip install --force-reinstall --no-cache-dir torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/test/cpu
87+
pip install --force-reinstall --no-cache-dir torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/cpu
8888
}
8989

9090
install_pytorch_and_domains() {
91-
pip install --force-reinstall --no-cache-dir torch==2.11.0 torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/test/cpu
91+
pip install --force-reinstall --no-cache-dir torch==2.11.0 torchvision==0.26.0 torchaudio==2.11.0 --index-url https://download.pytorch.org/whl/cpu
9292
}
9393

9494
build_executorch_runner_buck2() {

install_requirements.py

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# The pip repository that hosts torch packages.
1616
# This will be dynamically set based on CUDA availability and CUDA backend enabled/disabled.
17-
TORCH_URL_BASE = "https://download.pytorch.org/whl/test"
17+
TORCH_URL_BASE = "https://download.pytorch.org/whl"
1818

1919
# Since ExecuTorch often uses main-branch features of pytorch, only the nightly
2020
# pip versions will have the required features.
@@ -112,26 +112,6 @@ def install_optional_example_requirements(use_pytorch_nightly):
112112
# Determine the appropriate PyTorch URL based on CUDA delegate status
113113
torch_url = determine_torch_url(TORCH_URL_BASE)
114114

115-
print("Installing torch domain libraries")
116-
DOMAIN_LIBRARIES = [
117-
("torchvision==0.26.0" if use_pytorch_nightly else "torchvision"),
118-
("torchaudio==2.11.0" if use_pytorch_nightly else "torchaudio"),
119-
]
120-
# Then install domain libraries
121-
subprocess.run(
122-
[
123-
sys.executable,
124-
"-m",
125-
"pip",
126-
"install",
127-
"--no-cache-dir",
128-
*DOMAIN_LIBRARIES,
129-
"--extra-index-url",
130-
torch_url,
131-
],
132-
check=True,
133-
)
134-
135115
print("Installing packages in requirements-examples.txt")
136116
subprocess.run(
137117
[

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ dependencies=[
7878
"scikit-learn==1.7.1",
7979
"hydra-core>=1.3.0",
8080
"omegaconf>=2.3.0",
81+
"torch>=2.11.0",
8182
]
8283

8384
[project.urls]

requirements-examples.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ datasets == 3.6.0 # 4.0.0 deprecates trust_remote_code and load scripts. For now
44
timm == 1.0.7
55
torchsr == 1.0.4
66
torchtune @ git+https://github.com/pytorch/torchtune.git@6f2aa7254458145f99d7004cbd6ebc8e53a06404
7+
torchaudio >= 2.11.0
8+
torchvision >= 0.26.0
79
transformers == 5.0.0rc1

0 commit comments

Comments
 (0)