Get rid of imported map for LLVM.

Author: alexreinking

.github/workflows/testing-ecosystem.yml

@@ -21,25 +21,34 @@ env:
   LLVM_VERSION: 22
 
 jobs:
-  check_clang_tidy:
+  check_ubuntu:
     if: "!contains(github.event.pull_request.labels.*.name, 'skip_buildbots')"
-    name: CMake configure (simple vcpkg workflow)
+    name: CMake configure (Ubuntu 24.04)
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - name: Configure with vcpkg
+
+      - name: Install dependencies
         run: |
-          # Install uv like a user would
-          curl -LsSf https://astral.sh/uv/install.sh | sh
-          
-          # Install vcpkg like a user would
-          git clone https://github.com/microsoft/vcpkg.git
-          (cd vcpkg && ./bootstrap-vcpkg.sh -disableMetrics)
-          export VCPKG_ROOT="$PWD/vcpkg" 
+          # Get new enough LLVM from apt.llvm.org
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-${LLVM_VERSION} main" | \
+            sudo tee "/etc/apt/sources.list.d/llvm-${LLVM_VERSION}.list"
           
-          # Get LLVM from Halide's PyPI index, plus ninja/cmake
-          uv sync --no-install-project --group ci-llvm-22
-          source .venv/bin/activate
-          
-          # Configure Halide with vcpkg, pointing to the LLVM we just installed
-          cmake --preset release-vcpkg -DHalide_LLVM_ROOT="$(halide-llvm)"
+          # Get everything else from upstream Ubuntu
+          sudo apt-get update && sudo apt-get install -y \
+            "clang-${LLVM_VERSION}" \
+            curl \
+            flatbuffers-compiler \
+            "libclang-${LLVM_VERSION}-dev" \
+            libedit-dev \
+            libflatbuffers-dev \
+            libpng-dev \
+            libjpeg-turbo8-dev \
+            "liblld-${LLVM_VERSION}-dev" \
+            "lld-${LLVM_VERSION}" \
+            "llvm-${LLVM_VERSION}-dev" \
+            pybind11-dev 
+
+      - name: Check CMake configures
+        run: cmake --preset ubuntu-release

CMakePresets.json

@@ -114,6 +114,26 @@
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
+    {
+      "name": "ubuntu",
+      "inherits": "base",
+      "hidden": true,
+      "cacheVariables": {
+        "Halide_WASM_BACKEND": "OFF"
+      }
+    },
+    {
+      "name": "ubuntu-debug",
+      "inherits": ["ubuntu", "debug"],
+      "displayName": "Debug (Ubuntu)",
+      "description": "Debug build for a single-config generator, Ubuntu dependencies"
+    },
+    {
+      "name": "ubuntu-release",
+      "inherits": ["ubuntu", "release"],
+      "displayName": "Release (Ubuntu)",
+      "description": "Release build for a single-config generator, Ubuntu dependencies"
+    },
     {
       "name": "debug-vcpkg",
       "inherits": [

cmake/FindHalide_LLVM.cmake

@@ -4,11 +4,6 @@
 
 set(REASON_FAILURE_MESSAGE "")
 
-# Fallback configurations for weirdly built LLVMs
-set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL MinSizeRel Release RelWithDebInfo "")
-set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo Release MinSizeRel "")
-set(CMAKE_MAP_IMPORTED_CONFIG_RELEASE Release MinSizeRel RelWithDebInfo "")
-
 set(llvm_paths "")
 foreach (
     template IN ITEMS

src/CMakeLists.txt

@@ -521,13 +521,7 @@ target_compile_definitions(Halide PRIVATE WITH_WEBGPU)
 
 # Build serialization, enabled by default
 if (WITH_SERIALIZATION)
-    # Sadly, there seem to be at least three variations of the Flatbuffer
-    # package in terms of the case of the relevant CMake files. Fortunately,
-    # the IMPORTED targets appear to be consistently named `flatbuffers`.
-    find_package(
-        flatbuffers 23.5.26 REQUIRED
-        NAMES flatbuffers Flatbuffers FlatBuffers
-    )
+    find_package(FlatBuffers REQUIRED)
     _Halide_pkgdep(flatbuffers)
 
     target_link_libraries(Halide PRIVATE flatbuffers::flatbuffers)
@@ -583,7 +577,7 @@ if (MSVC AND Halide_WASM_BACKEND STREQUAL "wabt")
 endif ()
 
 if (Halide_WASM_BACKEND STREQUAL "wabt")
-    find_package(wabt 1.0.39 REQUIRED)
+    find_package(wabt REQUIRED)
     _Halide_pkgdep(wabt)
 
     target_link_libraries(Halide PRIVATE wabt::wabt)