Try again

Author: larryliu0820

.github/workflows/pull.yml

@@ -206,7 +206,7 @@ jobs:
         conda activate "${CONDA_ENV}"
 
         source .ci/scripts/utils.sh
-        install_executorch "--use-pt-pinned-commit"
+        install_executorch
         BUILD_TOOL="cmake"
         PYTHON_EXECUTABLE=python \
         bash .ci/scripts/build_llama_android.sh  "${BUILD_TOOL}"
@@ -362,7 +362,7 @@ jobs:
         CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
         conda activate "${CONDA_ENV}"
 
-        ./install_requirements.sh --use-pt-pinned-commit
+        ./install_requirements.sh
         # build module for executorch.extension.pybindings.portable_lib
         bash test/build_size_test.sh
         strip cmake-out/test/size_test
@@ -398,7 +398,7 @@ jobs:
         CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
         conda activate "${CONDA_ENV}"
 
-        ./install_requirements.sh --use-pt-pinned-commit
+        ./install_requirements.sh
 
         # build module for executorch.extension.pybindings.portable_lib
         bash test/build_size_test.sh
@@ -475,7 +475,7 @@ jobs:
         conda activate "${CONDA_ENV}"
 
         source .ci/scripts/utils.sh
-        install_executorch "--use-pt-pinned-commit"
+        install_executorch
 
         .ci/scripts/setup-arm-baremetal-tools.sh
 
@@ -512,7 +512,7 @@ jobs:
         MODE=${{ matrix.mode }}
         PT2E_QUANTIZE=${{ matrix.pt2e_quantize }}
 
-        ./install_requirements.sh --use-pt-pinned-commit
+        ./install_requirements.sh
         PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
         PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
 
@@ -706,7 +706,7 @@ jobs:
         conda activate "${CONDA_ENV}"
 
         source .ci/scripts/utils.sh
-        install_executorch "--use-pt-pinned-commit"
+        install_executorch
 
         PYTHON_EXECUTABLE=python bash .ci/scripts/setup-mediatek-deps.sh
         PYTHON_EXECUTABLE=python bash .ci/scripts/build-mediatek-sdk.sh

.github/workflows/trunk.yml

@@ -204,7 +204,7 @@ jobs:
         conda activate "${CONDA_ENV}"
 
         source .ci/scripts/utils.sh
-        install_executorch "--use-pt-pinned-commit"
+        install_executorch
 
         .ci/scripts/setup-arm-baremetal-tools.sh
 
@@ -235,7 +235,7 @@ jobs:
         conda activate "${CONDA_ENV}"
 
         source .ci/scripts/utils.sh
-        install_executorch "--use-pt-pinned-commit"
+        install_executorch
         .ci/scripts/setup-arm-baremetal-tools.sh
         source examples/arm/ethos-u-scratch/setup_path.sh
 
@@ -690,7 +690,7 @@ jobs:
         MODE=${{ matrix.mode }}
         PT2E_QUANTIZE=${{ matrix.pt2e_quantize }}
 
-        ./install_requirements.sh --use-pt-pinned-commit
+        ./install_requirements.sh
         PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
         PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
 

install_executorch.py

@@ -203,9 +203,13 @@ def main(args):
     os.environ["CMAKE_ARGS"] = " ".join(cmake_args)
 
     check_and_update_submodules()
+    # This option is used in CI to make sure that PyTorch build from the pinned commit
+    # is used instead of release. CI jobs wouldn't be able to catch regression from the
+    # latest PT commit otherwise
+    use_pytorch_release = not args.use_pt_pinned_commit
 
     # Step 1: Install core dependencies first
-    install_requirements()
+    install_requirements(use_pytorch_release)
 
     # Step 2: Install core package
     cmd = (
@@ -226,7 +230,7 @@ def main(args):
 
     # Step 3: Extra (optional) packages that is only useful for running examples.
     if not args.minimal:
-        install_optional_example_requirements()
+        install_optional_example_requirements(use_pytorch_release)
 
 
 if __name__ == "__main__":

install_requirements.py

@@ -62,9 +62,9 @@ def python_is_compatible():
 TORCH_URL = "https://download.pytorch.org/whl/test/cpu"
 
 
-def install_requirements():
-    # Error out on Intel macOS.
-    if is_intel_mac_os():
+def install_requirements(use_pytorch_release):
+    # Skip pip install on Intel macOS if using release
+    if use_pytorch_release and is_intel_mac_os():
         print(
             "ERROR: Prebuilt PyTorch wheels are no longer available for Intel-based macOS.\n"
             "Please build from source by following https://docs.pytorch.org/executorch/main/using-executorch-building-from-source.html",
@@ -74,7 +74,10 @@ def install_requirements():
 
     # pip packages needed by exir.
     TORCH_PACKAGE = [
-        "torch==2.8.0",
+        # 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_release else "torch",
     ]
 
     # Install the requirements for core ExecuTorch package.
@@ -126,7 +129,7 @@ def install_requirements():
     )
 
 
-def install_optional_example_requirements():
+def install_optional_example_requirements(use_pytorch_release):
     print("Installing packages in requirements-examples.txt")
     subprocess.run(
         [
@@ -142,8 +145,8 @@ def install_optional_example_requirements():
 
     print("Installing torch domain libraries")
     DOMAIN_LIBRARIES = [
-        "torchvision==0.23.0",
-        "torchaudio==2.8.0",
+        "torchvision==0.23.0" if use_pytorch_release else "torchvision",
+        "torchaudio==2.8.0" if use_pytorch_release else "torchaudio",
     ]
     # Then install domain libraries
     subprocess.run(
@@ -172,15 +175,21 @@ def is_intel_mac_os():
 
 def main(args):
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--use-pt-pinned-commit",
+        action="store_true",
+        help="build from the pinned PyTorch commit instead of nightly",
+    )
     parser.add_argument(
         "--example",
         action="store_true",
         help="Also installs required packages for running example scripts.",
     )
     args = parser.parse_args(args)
-    install_requirements()
+    use_pytorch_release = not bool(args.use_pt_pinned_commit)
+    install_requirements(use_pytorch_release)
     if args.example:
-        install_optional_example_requirements()
+        install_optional_example_requirements(use_pytorch_release)
 
 
 if __name__ == "__main__":