Skip to content

Commit b6711d7

Browse files
authored
Remove ARM Linux worker configurations (#326)
1 parent c0cc28c commit b6711d7

1 file changed

Lines changed: 4 additions & 19 deletions

File tree

master/master.cfg

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ class HalideWorker(Worker):
144144

145145

146146
c["workers"] = [
147-
HalideWorker("arm64-linux-worker-3", max_builds=1, arch="arm", bits=[32, 64], os="linux"),
148-
HalideWorker("arm64-linux-worker-4", max_builds=1, arch="arm", bits=[32, 64], os="linux"),
149147
HalideWorker("linux-worker-1", max_builds=4, arch="x86", bits=[32, 64], os="linux"),
150148
HalideWorker("linux-worker-4", max_builds=4, arch="x86", bits=[32, 64], os="linux"),
151149
HalideWorker("mac-arm-worker-1", max_builds=2, arch="arm", bits=[64], os="osx"),
@@ -217,15 +215,11 @@ class HalideBuilder(BuilderConfig):
217215
tags=self.builder_tags(),
218216
)
219217

220-
# The ARM workers aren't configured with Python at all.
221218
# We don't support the Python bindings on 32-bit at all.
222219
def handles_python(self):
223220
if self.bits == 32:
224221
return False
225222

226-
if self.arch == "arm" and self.os == "linux":
227-
return False
228-
229223
if self.sanitizer_preset() is not None:
230224
return False
231225

@@ -478,10 +472,6 @@ def get_cmake_definitions(builder_type, halide_target="host", wasm_jit="wabt", e
478472
if builder_type.has_ccache() and not builder_type.sanitizer_preset():
479473
cmake_definitions["Halide_CCACHE_BUILD"] = "ON"
480474

481-
if builder_type.arch == "arm" and builder_type.bits == 32 and builder_type.os == "linux":
482-
# Halide always uses its own toolchain files, from the cmake/ subdir.
483-
cmake_definitions["CMAKE_TOOLCHAIN_FILE"] = get_source_path("cmake", "toolchain.linux-arm32.cmake")
484-
485475
if builder_type.os == "windows":
486476
cmake_definitions["CMAKE_TOOLCHAIN_FILE"] = Interpolate("%(prop:VCPKG_ROOT)s/scripts/buildsystems/vcpkg.cmake")
487477
# CMake on Windows can't reliably find our pip-installed PyBind11 unless we set pybind11_ROOT to point to it
@@ -558,8 +548,6 @@ _PIP_PLATFORM_TAGS = {
558548
# (arch, bits, os) -> pip --platform tag; None means native (no flag needed)
559549
("x86", 64, "linux"): None,
560550
("x86", 32, "linux"): "manylinux_2_28_i686",
561-
("arm", 64, "linux"): None,
562-
("arm", 32, "linux"): "manylinux_2_31_armv7l",
563551
("x86", 64, "osx"): None,
564552
("arm", 64, "osx"): None,
565553
("x86", 64, "windows"): None,
@@ -918,12 +906,6 @@ def get_test_labels(builder_type):
918906
if preset:
919907
return targets
920908

921-
# TODO: some JIT+generator tests are failing on arm32; disable for now
922-
# pending fixes (see https://github.com/halide/Halide/issues/4940)
923-
if builder_type.arch == "arm" and builder_type.bits == 32 and builder_type.os == "linux":
924-
targets["host"].remove("internal")
925-
targets["host"].remove("generator")
926-
927909
if builder_type.handles_python():
928910
targets["host"].extend(["python"])
929911

@@ -1130,7 +1112,7 @@ def add_test_steps(factory, builder_type):
11301112
exclude_tests.append("tutorial_lesson_19")
11311113

11321114
if builder_type.arch == "arm" or builder_type.bits == 32:
1133-
# TODO: disable lesson_19 on arm32
1115+
# TODO: disable lesson_19 on ARM and 32-bit targets
11341116
# https://github.com/halide/Halide/issues/5224
11351117
exclude_tests.append("tutorial_lesson_19")
11361118

@@ -1259,6 +1241,9 @@ def get_interesting_targets():
12591241
if arch == "arm" and os == "windows":
12601242
# No buildbots for windows-on-arm (yet)
12611243
continue
1244+
if arch == "arm" and os == "linux":
1245+
# ARM Linux builds run on GitHub Actions instead.
1246+
continue
12621247
if os == "osx" and bits != 64:
12631248
# osx is 64-bit only, period
12641249
continue

0 commit comments

Comments
 (0)