diff --git a/.ci/scripts/setup-linux.sh b/.ci/scripts/setup-linux.sh index a090571ab49..7ee499c2d12 100755 --- a/.ci/scripts/setup-linux.sh +++ b/.ci/scripts/setup-linux.sh @@ -21,7 +21,3 @@ else install_executorch --use-pt-pinned-commit 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/install_requirements.py b/install_requirements.py index 0600c123dab..c36bace2de4 100644 --- a/install_requirements.py +++ b/install_requirements.py @@ -72,14 +72,6 @@ def install_requirements(use_pytorch_nightly): ) sys.exit(1) - # pip packages needed by exir. - TORCH_PACKAGE = [ - # Setting use_pytorch_nightly to false to test the pinned PyTorch commit. Note - # that we don't need to set any version number there because they have already - # been installed on CI before this step, so pip won't reinstall them - "torch==2.8.0" if use_pytorch_nightly else "torch", - ] - # Install the requirements for core ExecuTorch package. # `--extra-index-url` tells pip to look for package # versions on the provided URL if they aren't available on the default URL. @@ -91,7 +83,6 @@ def install_requirements(use_pytorch_nightly): "install", "-r", "requirements-dev.txt", - *TORCH_PACKAGE, "--extra-index-url", TORCH_URL, ], @@ -143,25 +134,6 @@ def install_optional_example_requirements(use_pytorch_nightly): 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, - ], - check=True, - ) - # Prebuilt binaries for Intel-based macOS are no longer available on PyPI; users must compile from source. # PyTorch stopped building macOS x86_64 binaries since version 2.3.0 (January 2024). 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..78bcb3e5e40 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,<2.9.0 +torchvision>=0.23.0,<0.24.0 \ No newline at end of file