Skip to content

[RELEASE-ONLY CHANGES] Update release/0.2 to pin and test against PyTorch release/2.3 #2818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/docker/ci_commit_pins/pytorch.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0a038cf0cff2d071b7359ac0491fd2ba7798a438
release/2.3
4 changes: 2 additions & 2 deletions backends/arm/arm_quantizer_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from torch.ao.quantization.pt2e.utils import (
_conv1d_bn_example_inputs,
_conv2d_bn_example_inputs,
_get_aten_graph_module_for_pattern,
get_aten_graph_module,
)
from torch.ao.quantization.quantizer import (
QuantizationAnnotation,
Expand Down Expand Up @@ -478,7 +478,7 @@ def _do_annotate_conv_bn(
# Match against all conv dimensions and cuda variants
for (conv_fn, example_inputs), is_cuda, relu_is_inplace in combinations:
pattern = _get_pattern(conv_fn, relu_is_inplace, has_relu)
pattern = _get_aten_graph_module_for_pattern(pattern, example_inputs, is_cuda)
pattern = get_aten_graph_module(pattern, example_inputs, is_cuda)
pattern.graph.eliminate_dead_code()
pattern.recompile()
matcher = SubgraphMatcherWithNameNodeMap(pattern, ignore_literals=True)
Expand Down
15 changes: 5 additions & 10 deletions install_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,14 @@ done
# Since ExecuTorch often uses main-branch features of pytorch, only the nightly
# pip versions will have the required features. The NIGHTLY_VERSION value should
# agree with the third-party/pytorch pinned submodule commit.
#
# NOTE: If a newly-fetched version of the executorch repo changes the value of
# NIGHTLY_VERSION, you should re-run this script to install the necessary
# package versions.
NIGHTLY_VERSION=dev20240324

# The pip repository that hosts nightly torch packages.
TORCH_NIGHTLY_URL="https://download.pytorch.org/whl/nightly/cpu"
TORCH_URL="https://download.pytorch.org/whl/test/cpu"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious if this will be the final url to fetch torch2.3? Maybe it's where RCs are, but not for the final release?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the RCs are there on that link. Once it's promoted to prod, the final prod binary will come from https://download.pytorch.org/whl/cpu or PyPI


# pip packages needed by exir.
EXIR_REQUIREMENTS=(
torch=="2.4.0.${NIGHTLY_VERSION}"
torchvision=="0.19.0.${NIGHTLY_VERSION}" # For testing.
torch=="2.3.0"
torchvision=="0.18.0"
)

# pip packages needed for development.
Expand All @@ -77,7 +72,7 @@ DEVEL_REQUIREMENTS=(
# TODO(dbort): Make each example publish its own requirements.txt
EXAMPLES_REQUIREMENTS=(
timm==0.6.13
torchaudio=="2.2.0.${NIGHTLY_VERSION}"
torchaudio=="2.3.0"
torchsr==1.0.4
transformers==4.38.2
)
Expand All @@ -92,7 +87,7 @@ REQUIREMENTS_TO_INSTALL=(

# Install the requirements. `--extra-index-url` tells pip to look for package
# versions on the provided URL if they aren't available on the default URL.
pip install --extra-index-url "${TORCH_NIGHTLY_URL}" \
pip install --extra-index-url "${TORCH_URL}" \
"${REQUIREMENTS_TO_INSTALL[@]}"

#
Expand Down
2 changes: 1 addition & 1 deletion third-party/pytorch
Submodule pytorch updated 1362 files