Skip to content

Commit bd7af45

Browse files
alexreinkingalexreinking
committed
Use vcpkg to manage hannk dependencies
1 parent 9a46ff0 commit bd7af45

17 files changed

Lines changed: 316 additions & 124 deletions

File tree

‎apps/hannk/CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set(CMAKE_CXX_EXTENSIONS NO)
2929
# (We need to do this even if HANNK_BUILD_TFLITE is off,
3030
# so that the .tflite file parser can get the right schema)
3131
set(TFLITE_VERSION_MAJOR "2" CACHE STRING "Major version of TFLite to assume")
32-
set(TFLITE_VERSION_MINOR "19" CACHE STRING "Minor version of TFLite to assume")
32+
set(TFLITE_VERSION_MINOR "21" CACHE STRING "Minor version of TFLite to assume")
3333
set(TFLITE_VERSION_PATCH "0" CACHE STRING "Patch version of TFLite to assume")
3434
set(TFLITE_VERSION "${TFLITE_VERSION_MAJOR}.${TFLITE_VERSION_MINOR}.${TFLITE_VERSION_PATCH}")
3535

@@ -44,6 +44,14 @@ add_compile_definitions(HANNK_BUILD_TFLITE=$<BOOL:${HANNK_BUILD_TFLITE}>)
4444

4545
# Find HalideHelpers -- this is just the Runtime headers and CMake functions, but no libraries
4646
find_package(HalideHelpers REQUIRED)
47+
if (HANNK_BUILD_TFLITE)
48+
find_package(tensorflow-lite CONFIG REQUIRED)
49+
endif ()
50+
51+
# Canonical include root for hannk headers (e.g. "util/error_util.h").
52+
add_library(hannk_headers INTERFACE)
53+
target_include_directories(hannk_headers INTERFACE
54+
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
4755

4856
# ----------------------------
4957

‎apps/hannk/delegate/CMakeLists.txt‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,24 @@
33
add_library(hannk_delegate STATIC
44
hannk_delegate.cpp)
55
target_link_libraries(hannk_delegate PRIVATE
6+
hannk_headers
67
hannk_log_tflite
78
interpreter_lower
8-
tensorflowlite_headers
9+
tensorflow-lite::tensorflow-lite
910
Halide::Runtime)
10-
target_include_directories(hannk_delegate PRIVATE
11-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
1211

1312
# --------------- registrar (static-library) delegate
1413

1514
add_library(hannk_delegate_registrar STATIC
1615
hannk_delegate_provider.cpp)
1716
target_link_libraries(hannk_delegate_registrar PRIVATE
17+
hannk_headers
1818
error_util
1919
interpreter
2020
hannk_delegate
2121
hannk_log_tflite
22-
tensorflowlite_headers
22+
tensorflow-lite::tensorflow-lite
2323
Halide::Runtime)
24-
target_include_directories(hannk_delegate_registrar PRIVATE
25-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
2624

2725

2826
# --------------- external (shared-library) delegate
@@ -33,20 +31,18 @@ target_include_directories(hannk_delegate_registrar PRIVATE
3331
add_library(hannk_delegate_external MODULE
3432
hannk_delegate_adaptor.cpp)
3533
target_link_libraries(hannk_delegate_external PRIVATE
34+
hannk_headers
3635
error_util
3736
interpreter
3837
hannk_delegate
3938
hannk_log_tflite
40-
tensorflowlite_headers
39+
tensorflow-lite::tensorflow-lite
4140
Halide::Runtime)
42-
target_include_directories(hannk_delegate_external PRIVATE
43-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
4441
if (APPLE)
4542
target_link_options(hannk_delegate_external PRIVATE "-Wl,-exported_symbols_list,${hannk_SOURCE_DIR}/delegate/exported_symbols.osx")
4643
else ()
4744
target_link_options(hannk_delegate_external PRIVATE "-Wl,--version-script,${hannk_SOURCE_DIR}/delegate/exported_symbols.ldscript")
48-
endif()
45+
endif ()
4946

5047
# Give it the name that we already use elsewhere ("lib" and ".so" will be added)
5148
set_target_properties(hannk_delegate_external PROPERTIES OUTPUT_NAME "HannkDelegate")
52-

‎apps/hannk/tflite/CMakeLists.txt‎

Lines changed: 10 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,12 @@
1-
include(FetchContent)
2-
3-
set(TFLITE_TAG "v${TFLITE_VERSION}")
4-
5-
message(STATUS "Fetching TFLite ${TFLITE_TAG}...")
6-
7-
# static linking makes life with TFLite much easier
8-
set(TFLITE_C_BUILD_SHARED_LIBS OFF)
9-
10-
# We don't care about comparing against these delegates (yet),
11-
# and disabling it reduces compile time meaningfully
12-
set(TFLITE_ENABLE_RUY OFF)
13-
set(TFLITE_ENABLE_XNNPACK OFF)
14-
15-
# Also have to disable some stuff dragged in by TFLite
16-
set(FLATBUFFERS_BUILD_TESTS OFF)
17-
set(FLATBUFFERS_INSTALL OFF)
18-
set(FLATBUFFERS_BUILD_FLATC OFF)
19-
20-
# Enable this to see details about downloading -- useful for debugging
21-
# set(FETCHCONTENT_QUIET NO)
22-
23-
# tflite includes neon2sse transitively, but it's pinned to an old version
24-
# that declares a minimum CMake version of 3.0. We override it here to a
25-
# new enough version that CMake 4+ won't refuse to build it.
26-
FetchContent_Declare(
27-
neon2sse
28-
GIT_REPOSITORY https://github.com/intel/ARM_NEON_2_x86_SSE
29-
GIT_TAG 4732aac1e6c02984a12635d85c4644c2ffe585ca
1+
add_library(tflite_parser STATIC tflite_parser.cpp)
2+
target_sources(
3+
tflite_parser
4+
PUBLIC
5+
FILE_SET HEADERS
6+
FILES tflite_parser.h
307
)
31-
32-
FetchContent_Declare(
33-
tflite
34-
GIT_REPOSITORY https://github.com/tensorflow/tensorflow
35-
GIT_TAG ${TFLITE_TAG}
36-
GIT_SHALLOW TRUE
37-
SOURCE_SUBDIR tensorflow/lite/c
8+
target_link_libraries(
9+
tflite_parser
10+
PUBLIC hannk_headers tensorflow-lite::tensorflow-lite interpreter
11+
PRIVATE Halide::Runtime
3812
)
39-
40-
block(SCOPE_FOR POLICIES VARIABLES)
41-
# Suppress warnings about rotting CMake code we don't control
42-
set(CMAKE_POLICY_DEFAULT_CMP0135 OLD) # DOWNLOAD_EXTRACT_TIMESTAMP
43-
set(CMAKE_POLICY_DEFAULT_CMP0169 OLD) # FetchContent_Populate
44-
set(CMAKE_POLICY_DEFAULT_CMP0177 OLD) # install() path normalization
45-
46-
# Configuration for tflite + upstream deps
47-
set(ABSL_PROPAGATE_CXX_STD ON)
48-
49-
# Suppress warnings in tflite code
50-
add_compile_options(
51-
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-anon-enum-enum-conversion>
52-
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-deprecated-this-capture>
53-
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-shadow-uncaptured-local>
54-
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-shadow>
55-
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-tautological-type-limit-compare>
56-
$<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-unused-template>
57-
)
58-
59-
FetchContent_MakeAvailable(tflite)
60-
61-
set_property(TARGET tensorflowlite_c PROPERTY EXCLUDE_FROM_ALL TRUE)
62-
endblock()
63-
64-
FetchContent_GetProperties(tflite)
65-
66-
# Make an interface library that is just to get the tflite headers,
67-
# without any implied linkage
68-
add_library(tensorflowlite_headers INTERFACE)
69-
target_include_directories(tensorflowlite_headers INTERFACE
70-
$<BUILD_INTERFACE:${tflite_SOURCE_DIR}>)
71-
72-
# ----------------
73-
add_library(tflite_parser STATIC tflite_parser.cpp)
74-
target_include_directories(tflite_parser
75-
PUBLIC $<BUILD_INTERFACE:${hannk_SOURCE_DIR}>
76-
PRIVATE $<BUILD_INTERFACE:${hannk_BINARY_DIR}>
77-
$<BUILD_INTERFACE:${tflite_SOURCE_DIR}>)
78-
# Ensure that the includes from TFLite's captive flatbuffer library get precedence;
79-
# in case the system may have a too-old version installed.
80-
target_include_directories(tflite_parser BEFORE
81-
PRIVATE $<BUILD_INTERFACE:${FlatBuffers_SOURCE_DIR}/include>)
82-
target_link_libraries(tflite_parser PRIVATE Halide::Runtime)

‎apps/hannk/util/CMakeLists.txt‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,55 @@
11
add_library(error_util STATIC
22
error_util.cpp)
3-
target_include_directories(error_util PUBLIC
4-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
5-
target_link_libraries(error_util PRIVATE Halide::Runtime)
3+
target_sources(error_util PUBLIC FILE_SET HEADERS FILES error_util.h)
4+
target_link_libraries(error_util PUBLIC hannk_headers
5+
PRIVATE Halide::Runtime)
6+
67

78
add_library(hannk_log_stderr STATIC EXCLUDE_FROM_ALL
89
hannk_log_stderr.cpp)
9-
target_include_directories(hannk_log_stderr PUBLIC
10-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
11-
target_link_libraries(hannk_log_stderr PUBLIC "$<$<PLATFORM_ID:Android>:log>")
10+
target_link_libraries(hannk_log_stderr PUBLIC
11+
hannk_headers
12+
"$<$<PLATFORM_ID:Android>:log>")
13+
1214

1315
add_library(hannk_log_tflite STATIC EXCLUDE_FROM_ALL
1416
hannk_log_tflite.cpp)
15-
target_link_libraries(hannk_log_tflite PRIVATE tensorflowlite_headers)
16-
target_include_directories(hannk_log_tflite PUBLIC
17-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
17+
target_link_libraries(hannk_log_tflite
18+
PRIVATE $<COMPILE_ONLY:tensorflow-lite::tensorflow-lite>
19+
PUBLIC hannk_headers)
1820

19-
# Sigh, header-only libraries shouldn't be special
2021
add_library(buffer_util INTERFACE)
21-
target_include_directories(buffer_util INTERFACE
22-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
22+
target_sources(buffer_util INTERFACE FILE_SET HEADERS FILES buffer_util.h)
23+
target_link_libraries(buffer_util INTERFACE hannk_headers)
2324

2425
add_library(file_util INTERFACE)
25-
target_include_directories(file_util INTERFACE
26-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
26+
target_sources(file_util INTERFACE FILE_SET HEADERS FILES file_util.h)
27+
target_link_libraries(file_util INTERFACE hannk_headers)
2728

2829
add_library(small_vector INTERFACE)
29-
target_include_directories(small_vector INTERFACE
30-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
30+
target_sources(small_vector INTERFACE FILE_SET HEADERS FILES small_vector.h)
31+
target_link_libraries(small_vector INTERFACE hannk_headers)
3132

3233
add_library(hannk_log_hdr INTERFACE)
33-
target_include_directories(hannk_log_hdr INTERFACE
34-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
34+
target_sources(hannk_log_hdr INTERFACE FILE_SET HEADERS FILES hannk_log_hdr.h)
35+
target_link_libraries(hannk_log_hdr INTERFACE hannk_headers)
3536

3637
add_library(model_runner STATIC
3738
model_runner.cpp)
38-
target_include_directories(model_runner PUBLIC
39-
$<BUILD_INTERFACE:${hannk_SOURCE_DIR}>)
4039
target_compile_definitions(model_runner PRIVATE
41-
-DTFLITE_VERSION_MAJOR=${TFLITE_VERSION_MAJOR}
42-
-DTFLITE_VERSION_MINOR=${TFLITE_VERSION_MINOR}
43-
-DTFLITE_VERSION_PATCH=${TFLITE_VERSION_PATCH})
40+
TFLITE_VERSION_MAJOR=${TFLITE_VERSION_MAJOR}
41+
TFLITE_VERSION_MINOR=${TFLITE_VERSION_MINOR}
42+
TFLITE_VERSION_PATCH=${TFLITE_VERSION_PATCH})
4443
target_link_libraries(model_runner PRIVATE
44+
hannk_headers
4545
interpreter
4646
error_util
4747
file_util
4848
tflite_parser
4949
Halide::Tools # for halide_benchmark.h
50-
Halide::Runtime
51-
tensorflowlite_headers)
52-
50+
Halide::Runtime)
5351
if (HANNK_BUILD_TFLITE)
5452
target_link_libraries(model_runner PRIVATE
55-
tensorflowlite_c
53+
tensorflow-lite::tensorflow-lite
5654
hannk_delegate)
5755
endif ()

‎apps/vcpkg-configuration.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"overlay-ports": [
3+
"vcpkg/ports"
4+
]
5+
}

‎apps/vcpkg.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
"license": "MIT",
55
"supports": "!uwp",
66
"builtin-baseline": "66c0373dc7fca549e5803087b9487edfe3aca0a1",
7-
"default-features": [
8-
"jit",
9-
"serialization"
10-
],
117
"dependencies": [
128
{
139
"name": "cuda",
@@ -20,6 +16,7 @@
2016
{
2117
"name": "opencl",
2218
"platform": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)"
23-
}
19+
},
20+
"tensorflow-lite"
2421
]
2522
}

‎apps/vcpkg/ports/farmhash/portfile.cmake‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
2+
3+
vcpkg_from_github(
4+
OUT_SOURCE_PATH SOURCE_PATH
5+
REPO google/farmhash
6+
REF 0d859a811870d10f53a594927d0d0b97573ad06d # latest (2019-05-13) as of 2026-02-24
7+
SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1
8+
)
9+
10+
file(INSTALL "${SOURCE_PATH}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/src")
11+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

‎apps/vcpkg/ports/farmhash/vcpkg.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "farmhash",
3+
"version": "1.1",
4+
"description": "FarmHash hash functions (source provider for TFLite in-tree build)",
5+
"homepage": "https://github.com/google/farmhash",
6+
"license": "MIT"
7+
}

‎apps/vcpkg/ports/fft2d/portfile.cmake‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
2+
3+
vcpkg_from_github(
4+
OUT_SOURCE_PATH SOURCE_PATH
5+
REPO petewarden/OouraFFT
6+
REF c6fd2dd6d21397baa6653139d31d84540d5449a2 # v1.0
7+
SHA512 e6ee68df13f803707384856c5b02460826ba03710cde9c17e64469026993806305d89fff139e91d99fe655550ba7cc66d3d69e14a682bfd34951382f7a95ec92
8+
)
9+
10+
file(INSTALL "${SOURCE_PATH}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/src")
11+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/readme2d.txt")

‎apps/vcpkg/ports/fft2d/vcpkg.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "fft2d",
3+
"version-string": "1.0",
4+
"description": "Ooura FFT C sources (source provider for TFLite in-tree build)",
5+
"homepage": "https://github.com/petewarden/OouraFFT",
6+
"license": "LicenseRef-OouraFFT"
7+
}

0 commit comments

Comments
 (0)