Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions master/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ class HalideWorker(Worker):


c["workers"] = [
HalideWorker("arm64-linux-worker-3", max_builds=1, arch="arm", bits=[32, 64], os="linux"),
HalideWorker("arm64-linux-worker-4", max_builds=1, arch="arm", bits=[32, 64], os="linux"),
HalideWorker("linux-worker-1", max_builds=4, arch="x86", bits=[32, 64], os="linux"),
HalideWorker("linux-worker-4", max_builds=4, arch="x86", bits=[32, 64], os="linux"),
HalideWorker("mac-arm-worker-1", max_builds=2, arch="arm", bits=[64], os="osx"),
Expand Down Expand Up @@ -217,15 +215,11 @@ class HalideBuilder(BuilderConfig):
tags=self.builder_tags(),
)

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

if self.arch == "arm" and self.os == "linux":
return False

if self.sanitizer_preset() is not None:
return False

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

if builder_type.arch == "arm" and builder_type.bits == 32 and builder_type.os == "linux":
# Halide always uses its own toolchain files, from the cmake/ subdir.
cmake_definitions["CMAKE_TOOLCHAIN_FILE"] = get_source_path("cmake", "toolchain.linux-arm32.cmake")

if builder_type.os == "windows":
cmake_definitions["CMAKE_TOOLCHAIN_FILE"] = Interpolate("%(prop:VCPKG_ROOT)s/scripts/buildsystems/vcpkg.cmake")
# CMake on Windows can't reliably find our pip-installed PyBind11 unless we set pybind11_ROOT to point to it
Expand Down Expand Up @@ -558,8 +548,6 @@ _PIP_PLATFORM_TAGS = {
# (arch, bits, os) -> pip --platform tag; None means native (no flag needed)
("x86", 64, "linux"): None,
("x86", 32, "linux"): "manylinux_2_28_i686",
("arm", 64, "linux"): None,
("arm", 32, "linux"): "manylinux_2_31_armv7l",
("x86", 64, "osx"): None,
("arm", 64, "osx"): None,
("x86", 64, "windows"): None,
Expand Down Expand Up @@ -918,12 +906,6 @@ def get_test_labels(builder_type):
if preset:
return targets

# TODO: some JIT+generator tests are failing on arm32; disable for now
# pending fixes (see https://github.com/halide/Halide/issues/4940)
if builder_type.arch == "arm" and builder_type.bits == 32 and builder_type.os == "linux":
targets["host"].remove("internal")
targets["host"].remove("generator")

if builder_type.handles_python():
targets["host"].extend(["python"])

Expand Down Expand Up @@ -1130,7 +1112,7 @@ def add_test_steps(factory, builder_type):
exclude_tests.append("tutorial_lesson_19")

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

Expand Down Expand Up @@ -1259,6 +1241,9 @@ def get_interesting_targets():
if arch == "arm" and os == "windows":
# No buildbots for windows-on-arm (yet)
continue
if arch == "arm" and os == "linux":
# ARM Linux builds run on GitHub Actions instead.
continue
if os == "osx" and bits != 64:
# osx is 64-bit only, period
continue
Expand Down
Loading