diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 9182b03d389..2c2d910da92 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -0a94bb432ed75cc2d950d81b2921363218a7e459 +27e35de6c288bffad1b4d18b393579c1d1a95547 diff --git a/.ci/docker/conda-env-ci.txt b/.ci/docker/conda-env-ci.txt index 8f2e65dae79..c675b3d9f6e 100644 --- a/.ci/docker/conda-env-ci.txt +++ b/.ci/docker/conda-env-ci.txt @@ -1,4 +1,5 @@ cmake=3.22.1 ninja=1.10.2 libuv +llvm-openmp pkg-config diff --git a/.ci/scripts/setup-macos.sh b/.ci/scripts/setup-macos.sh index 395f0c1767e..75f999af410 100755 --- a/.ci/scripts/setup-macos.sh +++ b/.ci/scripts/setup-macos.sh @@ -121,6 +121,7 @@ setup_macos_env_variables # NB: we need buck2 in all cases because cmake build also depends on calling # buck2 atm install_buck +brew install libomp install_pip_dependencies # TODO(huydhn): Unlike our self-hosted runner, GitHub runner doesn't have access diff --git a/backends/arm/test/models/test_conformer.py b/backends/arm/test/models/test_conformer.py index 65cd05d2704..e3be7811dd1 100644 --- a/backends/arm/test/models/test_conformer.py +++ b/backends/arm/test/models/test_conformer.py @@ -34,7 +34,7 @@ class TestConformer(unittest.TestCase): "executorch_exir_dialects_edge__ops_aten_where_self": 4, "executorch_exir_dialects_edge__ops_aten_logical_not_default": 4, "executorch_exir_dialects_edge__ops_aten_any_dim": 2, - "torch.ops.aten._assert_scalar.default": 12, + "torch.ops.aten._assert_scalar.default": 10, "torch.ops.aten._local_scalar_dense.default": 1, "torch.ops.aten.scalar_tensor.default": 2, "torch.ops.higher_order.executorch_call_delegate": 5, diff --git a/backends/arm/test/runner_utils.py b/backends/arm/test/runner_utils.py index 7131b723205..93c2d810da5 100644 --- a/backends/arm/test/runner_utils.py +++ b/backends/arm/test/runner_utils.py @@ -169,7 +169,7 @@ def _tosa_dispatch(self, lowered_backend_module: LoweredBackendModule, inputs): return run_tosa_graph(tosa_buffer, tosa_version, inputs) def __torch_function__(self, func, types, args=..., kwargs=None): - if isinstance(func, torch._higher_order_ops.executorch_call_delegate.ExecutorchCallDelegate): # type: ignore + if func is torch._higher_order_ops.executorch_call_delegate: lowered_backend_module = cast(LoweredBackendModule, args[0]) if lowered_backend_module.backend_id == "ArmBackend": return self._tosa_dispatch(lowered_backend_module, args[1:]) diff --git a/install_requirements.py b/install_requirements.py index c634e483945..e0e9629db78 100644 --- a/install_requirements.py +++ b/install_requirements.py @@ -67,7 +67,7 @@ def python_is_compatible(): # 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 = "dev20250104" +NIGHTLY_VERSION = "dev20250131" def install_requirements(use_pytorch_nightly): @@ -76,7 +76,7 @@ def install_requirements(use_pytorch_nightly): # 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 - f"torch==2.6.0.{NIGHTLY_VERSION}" if use_pytorch_nightly else "torch", + f"torch==2.7.0.{NIGHTLY_VERSION}" if use_pytorch_nightly else "torch", ( f"torchvision==0.22.0.{NIGHTLY_VERSION}" if use_pytorch_nightly