diff --git a/.ci/docker/common/install_pytorch.sh b/.ci/docker/common/install_pytorch.sh index 4bf33348681..32f753ba528 100755 --- a/.ci/docker/common/install_pytorch.sh +++ b/.ci/docker/common/install_pytorch.sh @@ -32,9 +32,9 @@ install_pytorch_and_domains() { pip_install "$(echo dist/*.whl)" # Grab the pinned audio and vision commits from PyTorch - TORCHAUDIO_VERSION=$(cat .github/ci_commit_pins/audio.txt) + TORCHAUDIO_VERSION=release/2.8 export TORCHAUDIO_VERSION - TORCHVISION_VERSION=$(cat .github/ci_commit_pins/vision.txt) + TORCHVISION_VERSION=release/0.23 export TORCHVISION_VERSION install_domains diff --git a/.ci/scripts/setup-linux.sh b/.ci/scripts/setup-linux.sh index a090571ab49..7edb85e2af7 100755 --- a/.ci/scripts/setup-linux.sh +++ b/.ci/scripts/setup-linux.sh @@ -16,12 +16,8 @@ read -r BUILD_TOOL BUILD_MODE EDITABLE < <(parse_args "$@") # have already been installed, so we use PyTorch build from source here instead # of nightly. This allows CI to test against latest commits from PyTorch if [[ "${EDITABLE:-false}" == "true" ]]; then - install_executorch --use-pt-pinned-commit --editable + install_executorch --editable else - install_executorch --use-pt-pinned-commit + install_executorch fi build_executorch_runner "${BUILD_TOOL}" "${BUILD_MODE}" - -if [[ "${GITHUB_BASE_REF:-}" == *main* || "${GITHUB_BASE_REF:-}" == *gh* ]]; then - do_not_use_nightly_on_ci -fi diff --git a/.ci/scripts/wheel/post_build_script.sh b/.ci/scripts/wheel/post_build_script.sh index c785139b3df..1bf20fd9304 100755 --- a/.ci/scripts/wheel/post_build_script.sh +++ b/.ci/scripts/wheel/post_build_script.sh @@ -12,3 +12,5 @@ set -eux # Rename pip-out directory, to avoid using shared libraries in pip-out during # smoke test. mv pip-out BACKUP-pip-out + +pip list diff --git a/.ci/scripts/wheel/pre_build_script.sh b/.ci/scripts/wheel/pre_build_script.sh index 424529af864..4c08b4a907c 100755 --- a/.ci/scripts/wheel/pre_build_script.sh +++ b/.ci/scripts/wheel/pre_build_script.sh @@ -15,3 +15,5 @@ set -euxo pipefail # able to see the installed torch package. "${GITHUB_WORKSPACE}/${REPOSITORY}/install_requirements.sh" --example + +pip list diff --git a/install_requirements.py b/install_requirements.py index 0600c123dab..0d44956c47d 100644 --- a/install_requirements.py +++ b/install_requirements.py @@ -139,23 +139,6 @@ def install_optional_example_requirements(use_pytorch_nightly): "install", "-r", "requirements-examples.txt", - ], - check=True, - ) - - print("Installing torch domain libraries") - DOMAIN_LIBRARIES = [ - ("torchvision==0.23.0" if use_pytorch_nightly else "torchvision"), - "torchaudio==2.8.0" if use_pytorch_nightly else "torchaudio", - ] - # Then install domain libraries - subprocess.run( - [ - sys.executable, - "-m", - "pip", - "install", - *DOMAIN_LIBRARIES, "--extra-index-url", TORCH_URL, ], diff --git a/pyproject.toml b/pyproject.toml index 7d44fef42a5..68d742a2795 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,6 +67,7 @@ dependencies=[ "pyyaml", "ruamel.yaml", "sympy", + "torch>=2.8.0,<2.9.0", "torchao==0.12.0", "tabulate", # See also third-party/TARGETS for buck's typing-extensions version. diff --git a/requirements-examples.txt b/requirements-examples.txt index 83f3d6bac4c..0e0cf95eae9 100644 --- a/requirements-examples.txt +++ b/requirements-examples.txt @@ -5,3 +5,5 @@ timm == 1.0.7 torchsr == 1.0.4 torchtune >= 0.6.1 transformers ==4.47.1 +torchaudio==2.8.0 +torchvision==0.23.0