Skip to content
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.

Sign up for GitHub

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

Fix the use of PyTorch pin commit in MacOS #7558

Merged
merged 8 commits into from
Jan 9, 2025
Merged

Fix the use of PyTorch pin commit in MacOS #7558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc67c6c
Fix the use of PyTorch pin commit in MacOS
huydhn Jan 9, 2025
07cedd7
Fix typo
huydhn Jan 9, 2025
c5bb091
Bring back install_pytorch_and_domains removed by https://github.com/…
huydhn Jan 9, 2025
e520bde
Bring back more changes from https://github.com/pytorch/executorch/pu…
huydhn Jan 9, 2025
16084bf
Could it be this flag
huydhn Jan 9, 2025
9bf460a
Try again
huydhn Jan 9, 2025
8a1c44d
Try this flag then
huydhn Jan 9, 2025
023381e
Another attempt
huydhn Jan 9, 2025
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: 2 additions & 0 deletions .ci/docker/conda-env-ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
cmake=3.22.1
ninja=1.10.2
libuv
pkg-config
6 changes: 5 additions & 1 deletion .ci/scripts/setup-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,9 @@ if [[ -z "${GITHUB_RUNNER:-}" ]]; then
fi

print_cmake_info
install_executorch
install_pytorch_and_domains
# We build PyTorch from source here instead of using nightly. This allows CI to test against
# the pinned commit from PyTorch
install_executorch "use-pt-pinned-commit"
build_executorch_runner "${BUILD_TOOL}"
do_not_use_nightly_on_ci
36 changes: 36 additions & 0 deletions .ci/scripts/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,42 @@ install_pip_dependencies() {
popd || return
}

install_domains() {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These functions were removed by #4826. This was wrong for CI job and we need to bring them back.

echo "Install torchvision and torchaudio"
pip install --no-use-pep517 --user "git+https://github.com/pytorch/audio.git@${TORCHAUDIO_VERSION}"
pip install --no-use-pep517 --user "git+https://github.com/pytorch/vision.git@${TORCHVISION_VERSION}"
}

install_pytorch_and_domains() {
pushd .ci/docker || return
TORCH_VERSION=$(cat ci_commit_pins/pytorch.txt)
popd || return

git clone https://github.com/pytorch/pytorch.git

# Fetch the target commit
pushd pytorch || return
git checkout "${TORCH_VERSION}"
git submodule update --init --recursive

export USE_DISTRIBUTED=1
# Then build and install PyTorch
python setup.py bdist_wheel
pip install "$(echo dist/*.whl)"

# Grab the pinned audio and vision commits from PyTorch
TORCHAUDIO_VERSION=$(cat .github/ci_commit_pins/audio.txt)
export TORCHAUDIO_VERSION
TORCHVISION_VERSION=$(cat .github/ci_commit_pins/vision.txt)
export TORCHVISION_VERSION

install_domains

popd || return
# Print sccache stats for debugging
sccache --show-stats || true
}

install_flatc_from_source() {
# NB: This function could be used to install flatbuffer from source
pushd third-party/flatbuffers || return
Expand Down