From a9290f7de35ffd66362af7180c557aada7173aab Mon Sep 17 00:00:00 2001
From: Scott Wolchok <swolchok@meta.com>
Date: Fri, 21 Mar 2025 14:19:23 -0700
Subject: [PATCH 1/2] Update

[ghstack-poisoned]
---
 .ci/scripts/unittest-macos.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.ci/scripts/unittest-macos.sh b/.ci/scripts/unittest-macos.sh
index db12c45c000..5ac833dba05 100755
--- a/.ci/scripts/unittest-macos.sh
+++ b/.ci/scripts/unittest-macos.sh
@@ -34,6 +34,10 @@ if [[ "$BUILD_TOOL" == "cmake" ]]; then
 
     .ci/scripts/unittest-macos-cmake.sh
 elif [[ "$BUILD_TOOL" == "buck2" ]]; then
+    (
+        source .ci/scripts/utils.sh
+        install_pytorch_and_domains
+    )
     .ci/scripts/unittest-buck2.sh
     # .ci/scripts/unittest-macos-buck2.sh
 else

From 47e81fcdae05b356e7b152df856a5fd4c7bfc4a8 Mon Sep 17 00:00:00 2001
From: Scott Wolchok <swolchok@meta.com>
Date: Fri, 21 Mar 2025 14:44:43 -0700
Subject: [PATCH 2/2] Update

[ghstack-poisoned]
---
 .ci/scripts/unittest-macos.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.ci/scripts/unittest-macos.sh b/.ci/scripts/unittest-macos.sh
index 5ac833dba05..d5ca97404aa 100755
--- a/.ci/scripts/unittest-macos.sh
+++ b/.ci/scripts/unittest-macos.sh
@@ -19,14 +19,14 @@ export TMP_DIR=$(mktemp -d)
 export PATH="${TMP_DIR}:$PATH"
 trap 'rm -rfv ${TMP_DIR}' EXIT
 
-if [[ "$BUILD_TOOL" == "cmake" ]]; then
-    # Setup MacOS dependencies as there is no Docker support on MacOS atm
-    PYTHON_EXECUTABLE=python \
-    EXECUTORCH_BUILD_PYBIND=ON \
-    CMAKE_ARGS="-DEXECUTORCH_BUILD_COREML=ON -DEXECUTORCH_BUILD_MPS=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON" \
-    ${CONDA_RUN} --no-capture-output \
-    .ci/scripts/setup-macos.sh "$@"
+# Setup MacOS dependencies as there is no Docker support on MacOS atm
+PYTHON_EXECUTABLE=python \
+EXECUTORCH_BUILD_PYBIND=ON \
+CMAKE_ARGS="-DEXECUTORCH_BUILD_COREML=ON -DEXECUTORCH_BUILD_MPS=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON" \
+${CONDA_RUN} --no-capture-output \
+.ci/scripts/setup-macos.sh "$@"
 
+if [[ "$BUILD_TOOL" == "cmake" ]]; then
     # Install llama3_2_vision dependencies.
     PYTHON_EXECUTABLE=python \
     ${CONDA_RUN} --no-capture-output \
@@ -34,10 +34,6 @@ if [[ "$BUILD_TOOL" == "cmake" ]]; then
 
     .ci/scripts/unittest-macos-cmake.sh
 elif [[ "$BUILD_TOOL" == "buck2" ]]; then
-    (
-        source .ci/scripts/utils.sh
-        install_pytorch_and_domains
-    )
     .ci/scripts/unittest-buck2.sh
     # .ci/scripts/unittest-macos-buck2.sh
 else