8000 add halide 18 · awakecoding/llvm-prebuilt@b17db9a · GitHub
[go: up one dir, main page]
Skip to content

Commit b17db9a

Browse files
author
Marc-André Moreau
committed
add halide 18
1 parent daf2f66 commit b17db9a

7 files changed

+128
-52
lines changed

‎.github/workflows/github-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
version:
66
description: 'release version'
77
required: true
8-
default: '2023.3.0'
8+
default: '2025.1.0'
99
llvm_run_id:
1010
description: 'llvm workflow run id'
1111
default: "latest"
@@ -32,7 +32,7 @@ on:
3232
jobs:
3333
publish:
3434
name: Publish packages
35-
runs-on: ubuntu-20.04
35+
runs-on: ubuntu-latest
3636

3737
steps:
3838
- name: Download llvm

‎.github/workflows/halide-prebuilt.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
arch: [ x86_64, aarch64 ]
1717
os: [ windows, macos, ubuntu-20.04, ubuntu-22.04 ]
18-
version: [ 16.0.0 ]
18+
version: [ 16.0.0, 18.0.0 ]
1919

2020
include:
2121
- os: windows
@@ -163,9 +163,15 @@ jobs:
163163
- name: Patch Halide
164164
shell: pwsh
165165
run: |
166-
git -C halide apply ../llvm-prebuilt/patches/halide-16-add-halide-host-tools-dir-cmake-option.patch
167-
git -C halide apply ../llvm-prebuilt/patches/halide-16-disable-autoschedulers.patch
168-
git -C halide apply ../llvm-prebuilt/patches/halide-16-disable-clang-verbose-build-warnings.patch
166+
if ('${{matrix.version}}' -eq '16.0.0') {
167+
git -C halide apply ../llvm-prebuilt/patches/halide-16-add-halide-host-tools-dir-cmake-option.patch
168+
git -C halide apply ../llvm-prebuilt/patches/halide-16-disable-autoschedulers.patch
169+
git -C halide apply ../llvm-prebuilt/patches/halide-16-disable-clang-verbose-build-warnings.patch
170+
} else {
171+
git -C halide apply ../llvm-prebuilt/patches/halide-18-add-halide-host-tools-dir-cmake-option.patch
172+
git -C halide apply ../llvm-prebuilt/patches/halide-18-disable-autoschedulers.patch
173+
git -C halide apply ../llvm-prebuilt/patches/halide-18-disable-clang-verbose-build-warnings.patch
174+
}
169175
170176
- name: Build Halide host tools
171177
shell: pwsh
@@ -214,6 +220,7 @@ jobs:
214220
$CMakeArgs += @("-DWITH_TESTS=OFF", "-DWITH_TUTORIALS=OFF")
215221
$CMakeArgs += @("-DWITH_DOCS=OFF", "-DWITH_UTILS=OFF")
216222
$CMakeArgs += @("-DWITH_PYTHON_BINDINGS=OFF")
223+
$CMakeArgs += @("-DWITH_SERIALIZATION=OFF")
217224
$CMakeArgs += @("-DTARGET_WEBASSEMBLY=ON")
218225
$CMakeArgs += @("-Wno-dev")
219226

‎README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ This is a repository to create prebuilt clang+llvm distributions for major opera
44

55
## clang-llvm
66

7-
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04
8-
----------------------|--------------------|--------------------|--------------------|--------------------
9-
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
10-
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
7+
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04 | Ubuntu 24.04
8+
----------------------|--------------------|--------------------|--------------------|--------------------|--------------------
9+
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :white_large_square:
10+
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :white_large_square:
1111

1212
## ctools
1313

14-
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04
15-
----------------------|--------------------|--------------------|--------------------|--------------------
16-
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
17-
aarch64 | :white_large_square: | :white_large_square: | :white_large_square: | :white_large_square:
14+
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04 | Ubuntu 24.04
15+
----------------------|--------------------|--------------------|--------------------|--------------------|--------------------
16+
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :white_large_square:
17+
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :white_large_square: | :heavy_check_mark:| :white_large_square:
1818

1919
## Halide
2020

21-
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04
22-
----------------------|--------------------|--------------------|--------------------|--------------------
23-
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
24-
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
21+
Arch | Windows | macOS | Ubuntu 20.04 | Ubuntu 22.04 | Ubuntu 24.04
22+
----------------------|--------------------|--------------------|--------------------|--------------------|--------------------
23+
x86_64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
24+
aarch64 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:

‎patches/halide-16-disable-imported-clang-llvm-executables.patch

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎patches/halide-18-add-halide-host-tools-dir-cmake-option.patch

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 37576a87da1ae331225231c56c8c36aa389ef383 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <mamoreau@devolutions.net>
3+
Date: Sat, 21 Jan 2023 10:15:38 -0500
4+
Subject: [PATCH 1/3] add HALIDE_HOST_TOOLS_DIR cmake option
5+
6+
---
7+
tools/CMakeLists.txt | 26 ++++++++++++++++++++------
8+
1 file changed, 20 insertions(+), 6 deletions(-)
9+
10+
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
11+
index 2d66e5271..25336723e 100644
12+
--- a/tools/CMakeLists.txt
13+
+++ b/tools/CMakeLists.txt
14+
@@ -2,14 +2,28 @@
15+
# Build time tools
16+
##
17+
18+
-add_executable(build_halide_h build_halide_h.cpp)
19+
-target_compile_options(build_halide_h PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4996>)
20+
+if(DEFINED HALIDE_HOST_TOOLS_DIR)
21+
+ add_executable(build_halide_h IMPORTED GLOBAL)
22+
+ set_property(TARGET build_halide_h PROPERTY IMPORTED_LOCATION
23+
+ "${HALIDE_HOST_TOOLS_DIR}/build_halide_h${CMAKE_EXECUTABLE_SUFFIX}")
24+
25+
-add_executable(binary2cpp binary2cpp.cpp)
26+
-target_compile_options(binary2cpp PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4996>)
27+
+ add_executable(binary2cpp IMPORTED GLOBAL)
28+
+ set_property(TARGET binary2cpp PROPERTY IMPORTED_LOCATION
29+
+ "${HALIDE_HOST_TOOLS_DIR}/binary2cpp${CMAKE_EXECUTABLE_SUFFIX}")
30+
31+
-add_executable(regexp_replace regexp_replace.cpp)
32+
-target_compile_options(regexp_replace PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4996>)
33+
+ add_executable(regexp_replace IMPORTED GLOBAL)
34+
+ set_property(TARGET regexp_replace PROPERTY IMPORTED_LOCATION
35+
+ "${HALIDE_HOST_TOOLS_DIR}/regexp_replace${CMAKE_EXECUTABLE_SUFFIX}")
36+
+else()
37+
+ add_executable(build_halide_h build_halide_h.cpp)
38+
+ target_compile_options(build_halide_h PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4996>)
39+
+
40+
+ add_executable(binary2cpp binary2cpp.cpp)
41+
+ target_compile_options(binary2cpp PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4996>)
42+
+
43+
+ add_executable(regexp_replace regexp_replace.cpp)
44+
+ target_compile_options(regexp_replace PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4996>)
45+
+endif()
46+
47+
##
48+
# Interface target for enabling PNG/JPEG support in Halide
49+
--
50+
2.34.1
51+

‎patches/halide-18-disable-autoschedulers.patch

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 51ed947d7189a52bc0dd0f68b20c7fb201d2821c Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <mamoreau@devolutions.net>
3+
Date: Sun, 22 Jan 2023 08:01:56 -0500
4+
Subject: [PATCH 2/3] disable autoschedulers
5+
6+
---
7+
src/CMakeLists.txt | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
11+
index 3a89e132b..222b7335b 100644
12+
--- a/src/CMakeLists.txt
13+
+++ b/src/CMakeLists.txt
14+
@@ -636,8 +636,8 @@ endif()
15+
##
16+
17+
if (BUILD_SHARED_LIBS)
18+
- message(STATUS "Building autoschedulers enabled")
19+
- add_subdirectory(autoschedulers)
20+
+ #message(STATUS "Building autoschedulers enabled")
21+
+ #add_subdirectory(autoschedulers)
22+
else ()
23+
message(STATUS "Building autoschedulers disabled (static Halide)")
24+
endif ()
25+
--
26+
2.34.1
27+

‎patches/halide-18-disable-clang-verbose-build-warnings.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 200357d3a6242b6dfed56930be0562f58aff9f9a Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <mamoreau@devolutions.net>
3+
Date: Sun, 16 Feb 2025 14:55:46 -0500
4+
Subject: [PATCH 3/3] disable clang verbose build warnings
5+
6+
---
7+
CMakeLists.txt | 2 ++
8+
1 file changed, 2 insertions(+)
9+
10+
diff --git a/CMakeLists.txt b/CMakeLists.txt
11+
index 287ec4496..5563f4a69 100644
12+
--- a/CMakeLists.txt
13+
+++ b/CMakeLists.txt
14+
@@ -151,6 +151,8 @@ function(set_halide_compiler_warnings NAME)
15+
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-undefined-func-template>
16+
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-unused-member-function>
17+
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-unused-template>
18+
+ $<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-unknown-warning-option>
19+
+ $<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-unsafe-buffer-usage>
20+
21+
# This warning was removed in Clang 13
22+
$<$<AND:$<CXX_COMPILER_ID:Clang,AppleClang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,13.0>>:-Wno-return-std-move-in-c++11>
23+
--
24+
2.34.1
25+

0 commit comments

Comments
 (0)
0