From 98e4cd4106b3a30656ca7ba37adf64dfb01c8c4e Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Fri, 14 Feb 2025 13:41:11 -0800 Subject: [PATCH] Don't run the `--nobuild` command for MACOS_CPU_ARM64. We can probably install `parallel` via `brew` in an extra setup command but for now align with MACOS_CPU_X86. PiperOrigin-RevId: 727049046 --- build_tools/ci/build.py | 5 ++++- build_tools/ci/golden_commands.txt | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build_tools/ci/build.py b/build_tools/ci/build.py index 49de3e799a75b..bfa28e337159d 100755 --- a/build_tools/ci/build.py +++ b/build_tools/ci/build.py @@ -159,7 +159,10 @@ def commands(self) -> List[List[str]]: # problems in practice. # TODO(ddunleavy): Remove the condition here. Need to get parallel on the # MacOS VM. - if self.type_ != BuildType.MACOS_CPU_X86: + if ( + self.type_ != BuildType.MACOS_CPU_X86 + and self.type_ != BuildType.MACOS_CPU_ARM64 + ): cmds.append( retry( self.bazel_command( diff --git a/build_tools/ci/golden_commands.txt b/build_tools/ci/golden_commands.txt index 032dc4c4039e7..755ee7c848c21 100644 --- a/build_tools/ci/golden_commands.txt +++ b/build_tools/ci/golden_commands.txt @@ -27,7 +27,6 @@ bazel analyze-profile profile.json.gz # BEGIN BuildType.MACOS_CPU_ARM64 bazel --version mkdir -p /Volumes/BuildData/bazel_output -parallel --ungroup --retries 3 --delay 15 --nonall -- bazel build --build_tag_filters=-no_oss,-gpu,-no_mac,-mac_excluded,-requires-gpu-nvidia,-requires-gpu-amd --test_tag_filters=-no_oss,-gpu,-no_mac,-mac_excluded,-requires-gpu-nvidia,-requires-gpu-amd --config=nonccl --test_output=errors --verbose_failures --keep_going --nobuild_tests_only --profile=profile.json.gz --flaky_test_attempts=3 --jobs=150 --bes_upload_mode=fully_async --macos_minimum_os=10.15 --test_tmpdir=/Volumes/BuildData/bazel_output --nobuild -- //xla/... -//xla/hlo/experimental/... -//xla/python_api/... -//xla/python/... -//xla/service/gpu/... bazel test --build_tag_filters=-no_oss,-gpu,-no_mac,-mac_excluded,-requires-gpu-nvidia,-requires-gpu-amd --test_tag_filters=-no_oss,-gpu,-no_mac,-mac_excluded,-requires-gpu-nvidia,-requires-gpu-amd --config=nonccl --test_output=errors --verbose_failures --keep_going --nobuild_tests_only --profile=profile.json.gz --flaky_test_attempts=3 --jobs=150 --bes_upload_mode=fully_async --macos_minimum_os=10.15 --test_tmpdir=/Volumes/BuildData/bazel_output -- //xla/... -//xla/hlo/experimental/... -//xla/python_api/... -//xla/python/... -//xla/service/gpu/... bazel analyze-profile profile.json.gz # END BuildType.MACOS_CPU_ARM64