Skip to content
Closed
Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ apple/*.xcframework
apple/libcactus.a
*.a
!libs/curl/**/*.a
!libs/xgrammar/**/*.a
venv

__pycache__
Expand All @@ -39,4 +40,4 @@ tests/plan.md
tests/assets/test_wav_info.txt
vision_activations.json
gemma-4-eap-extras/
.githooks/
.githooks/
16 changes: 14 additions & 2 deletions android/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)

set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/../cactus)
set(CACTUS_CURL_ROOT "${CMAKE_SOURCE_DIR}/../libs/curl" CACHE PATH "Path to vendored libcurl artifacts")
set(CACTUS_XGRAMMAR_ROOT "${CMAKE_SOURCE_DIR}/../libs/xgrammar" CACHE PATH "Path to vendored xgrammar artifacts")

set(_CACTUS_VERSION_FILE "${CMAKE_SOURCE_DIR}/../CACTUS_VERSION")
if(EXISTS "${_CACTUS_VERSION_FILE}")
Expand Down Expand Up @@ -90,6 +91,8 @@ target_link_libraries(cactus ${LOG_LIB} android)

set(CACTUS_CURL_INCLUDE_DIR "${CACTUS_CURL_ROOT}/include")
set(CACTUS_CURL_LIBRARY_ANDROID "${CACTUS_CURL_ROOT}/android/${ANDROID_ABI}/libcurl.a")
set(CACTUS_XGRAMMAR_INCLUDE_DIR "${CACTUS_XGRAMMAR_ROOT}/include")
set(CACTUS_XGRAMMAR_LIBRARY_ANDROID "${CACTUS_XGRAMMAR_ROOT}/android/${ANDROID_ABI}/libxgrammar.a")
set(CACTUS_MBEDTLS_ROOT "${CMAKE_SOURCE_DIR}/mbedtls/${ANDROID_ABI}")
if(NOT EXISTS "${CACTUS_MBEDTLS_ROOT}")
set(CACTUS_MBEDTLS_ROOT "${CMAKE_SOURCE_DIR}/../libs/mbedtls/android/${ANDROID_ABI}")
Expand All @@ -105,17 +108,26 @@ if(EXISTS "${CACTUS_CURL_INCLUDE_DIR}/curl/curl.h" AND EXISTS "${CACTUS_CURL_LIB
message(FATAL_ERROR "Vendored mbedTLS libraries not found. Expected: ${CACTUS_MBEDTLS_LIBRARY}, ${CACTUS_MBEDX509_LIBRARY}, ${CACTUS_MBEDCRYPTO_LIBRARY}")
endif()

if(NOT EXISTS "${CACTUS_XGRAMMAR_INCLUDE_DIR}/xgrammar/xgrammar.h" OR NOT EXISTS "${CACTUS_XGRAMMAR_LIBRARY_ANDROID}")
message(FATAL_ERROR "Vendored Android xgrammar not found. Expected: ${CACTUS_XGRAMMAR_INCLUDE_DIR}/xgrammar/xgrammar.h and ${CACTUS_XGRAMMAR_LIBRARY_ANDROID}")
endif()
message(STATUS "Using vendored xgrammar for Android: ${CACTUS_XGRAMMAR_LIBRARY_ANDROID}")

target_include_directories(cactus PRIVATE "${CACTUS_CURL_INCLUDE_DIR}")
target_include_directories(cactus_static PRIVATE "${CACTUS_CURL_INCLUDE_DIR}")
target_include_directories(cactus PRIVATE "${CACTUS_MBEDTLS_INCLUDE_DIR}")
target_include_directories(cactus_static PRIVATE "${CACTUS_MBEDTLS_INCLUDE_DIR}")
target_compile_definitions(cactus PRIVATE CACTUS_USE_CURL=1)
target_compile_definitions(cactus_static PRIVATE CACTUS_USE_CURL=1)
target_include_directories(cactus PRIVATE "${CACTUS_XGRAMMAR_INCLUDE_DIR}")
target_include_directories(cactus_static PRIVATE "${CACTUS_XGRAMMAR_INCLUDE_DIR}")
target_compile_definitions(cactus PRIVATE CACTUS_USE_CURL=1 CACTUS_USE_XGRAMMAR=1)
target_compile_definitions(cactus_static PRIVATE CACTUS_USE_CURL=1 CACTUS_USE_XGRAMMAR=1)

target_link_libraries(cactus "${CACTUS_CURL_LIBRARY_ANDROID}")
target_link_libraries(cactus_static "${CACTUS_CURL_LIBRARY_ANDROID}")
target_link_libraries(cactus "${CACTUS_MBEDTLS_LIBRARY}" "${CACTUS_MBEDX509_LIBRARY}" "${CACTUS_MBEDCRYPTO_LIBRARY}")
target_link_libraries(cactus_static "${CACTUS_MBEDTLS_LIBRARY}" "${CACTUS_MBEDX509_LIBRARY}" "${CACTUS_MBEDCRYPTO_LIBRARY}")
target_link_libraries(cactus "${CACTUS_XGRAMMAR_LIBRARY_ANDROID}")
target_link_libraries(cactus_static "${CACTUS_XGRAMMAR_LIBRARY_ANDROID}")
else()
message(FATAL_ERROR "Vendored Android libcurl not found. Expected: ${CACTUS_CURL_INCLUDE_DIR}/curl/curl.h and ${CACTUS_CURL_LIBRARY_ANDROID}")
endif()
Expand Down
24 changes: 22 additions & 2 deletions apple/CmakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "16.0" CACHE STRING "Minimu

set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/../cactus)
set(CACTUS_CURL_ROOT "${CMAKE_SOURCE_DIR}/../libs/curl" CACHE PATH "Path to vendored libcurl artifacts")
set(CACTUS_XGRAMMAR_ROOT "${CMAKE_SOURCE_DIR}/../libs/xgrammar" CACHE PATH "Path to vendored xgrammar artifacts")

set(_CACTUS_VERSION_FILE "${CMAKE_SOURCE_DIR}/../CACTUS_VERSION")
if(EXISTS "${_CACTUS_VERSION_FILE}")
Expand All @@ -24,6 +25,12 @@ if(NOT CMAKE_BUILD_TYPE)
message(STATUS "CMAKE_BUILD_TYPE was not set, defaulting to Release.")
endif()

function(cactus_require_vendored_xgrammar include_dir library_path platform_label)
if(NOT EXISTS "${include_dir}/xgrammar/xgrammar.h" OR NOT EXISTS "${library_path}")
message(FATAL_ERROR "Vendored ${platform_label} xgrammar not found. Expected: ${include_dir}/xgrammar/xgrammar.h and ${library_path}")
endif()
endfunction()

file(GLOB ENGINE_SOURCES "${SOURCE_DIR}/engine/*.cpp")
file(GLOB GRAPH_SOURCES "${SOURCE_DIR}/graph/*.cpp")
file(GLOB KERNEL_SOURCES "${SOURCE_DIR}/kernel/*.cpp")
Expand Down Expand Up @@ -113,10 +120,14 @@ find_library(CFNETWORK_FRAMEWORK CFNetwork REQUIRED)
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(CACTUS_CURL_INCLUDE_DIR "${CACTUS_CURL_ROOT}/include")
set(CACTUS_CURL_LIBRARY_MACOS "${CACTUS_CURL_ROOT}/macos/libcurl.a")
set(CACTUS_XGRAMMAR_INCLUDE_DIR "${CACTUS_XGRAMMAR_ROOT}/include")
set(CACTUS_XGRAMMAR_LIBRARY_MACOS "${CACTUS_XGRAMMAR_ROOT}/macos/libxgrammar.a")
if(NOT EXISTS "${CACTUS_CURL_INCLUDE_DIR}/curl/curl.h" OR NOT EXISTS "${CACTUS_CURL_LIBRARY_MACOS}")
message(FATAL_ERROR "Vendored macOS libcurl not found. Expected: ${CACTUS_CURL_INCLUDE_DIR}/curl/curl.h and ${CACTUS_CURL_LIBRARY_MACOS}")
endif()
cactus_require_vendored_xgrammar("${CACTUS_XGRAMMAR_INCLUDE_DIR}" "${CACTUS_XGRAMMAR_LIBRARY_MACOS}" "macOS")
message(STATUS "Using vendored libcurl for macOS: ${CACTUS_CURL_LIBRARY_MACOS}")
message(STATUS "Using vendored xgrammar for macOS: ${CACTUS_XGRAMMAR_LIBRARY_MACOS}")
target_link_libraries(cactus PUBLIC
${COREML_FRAMEWORK}
${FOUNDATION_FRAMEWORK}
Expand All @@ -125,9 +136,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
${SYSTEMCONFIGURATION_FRAMEWORK}
${CFNETWORK_FRAMEWORK}
"${CACTUS_CURL_LIBRARY_MACOS}"
"${CACTUS_XGRAMMAR_LIBRARY_MACOS}"
)
target_include_directories(cactus PUBLIC "${CACTUS_CURL_INCLUDE_DIR}")
target_compile_definitions(cactus PRIVATE CACTUS_USE_CURL=1)
target_include_directories(cactus PUBLIC "${CACTUS_XGRAMMAR_INCLUDE_DIR}")
target_compile_definitions(cactus PRIVATE CACTUS_USE_CURL=1 CACTUS_USE_XGRAMMAR=1)
elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
target_link_libraries(cactus PUBLIC
${COREML_FRAMEWORK}
Expand All @@ -138,19 +151,26 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
${CFNETWORK_FRAMEWORK}
)
set(CACTUS_CURL_INCLUDE_DIR "${CACTUS_CURL_ROOT}/include")
set(CACTUS_XGRAMMAR_INCLUDE_DIR "${CACTUS_XGRAMMAR_ROOT}/include")
string(TOLOWER "${CMAKE_OSX_SYSROOT}" CACTUS_SYSROOT_LOWER)
if(CACTUS_SYSROOT_LOWER MATCHES "simulator")
set(CACTUS_CURL_LIBRARY_IOS "${CACTUS_CURL_ROOT}/ios/simulator/libcurl.a")
set(CACTUS_XGRAMMAR_LIBRARY_IOS "${CACTUS_XGRAMMAR_ROOT}/ios/simulator/libxgrammar.a")
else()
set(CACTUS_CURL_LIBRARY_IOS "${CACTUS_CURL_ROOT}/ios/device/libcurl.a")
set(CACTUS_XGRAMMAR_LIBRARY_IOS "${CACTUS_XGRAMMAR_ROOT}/ios/device/libxgrammar.a")
endif()
if(NOT EXISTS "${CACTUS_CURL_INCLUDE_DIR}/curl/curl.h" OR NOT EXISTS "${CACTUS_CURL_LIBRARY_IOS}")
message(FATAL_ERROR "Vendored iOS libcurl not found for sysroot ${CMAKE_OSX_SYSROOT}. Expected: ${CACTUS_CURL_INCLUDE_DIR}/curl/curl.h and ${CACTUS_CURL_LIBRARY_IOS}")
endif()
cactus_require_vendored_xgrammar("${CACTUS_XGRAMMAR_INCLUDE_DIR}" "${CACTUS_XGRAMMAR_LIBRARY_IOS}" "iOS")
message(STATUS "Using vendored libcurl for iOS: ${CACTUS_CURL_LIBRARY_IOS}")
message(STATUS "Using vendored xgrammar for iOS: ${CACTUS_XGRAMMAR_LIBRARY_IOS}")
target_link_libraries(cactus PUBLIC "${CACTUS_CURL_LIBRARY_IOS}")
target_link_libraries(cactus PUBLIC "${CACTUS_XGRAMMAR_LIBRARY_IOS}")
target_include_directories(cactus PUBLIC "${CACTUS_CURL_INCLUDE_DIR}")
target_compile_definitions(cactus PRIVATE CACTUS_USE_CURL=1)
target_include_directories(cactus PUBLIC "${CACTUS_XGRAMMAR_INCLUDE_DIR}")
target_compile_definitions(cactus PRIVATE CACTUS_USE_CURL=1 CACTUS_USE_XGRAMMAR=1)
else()
target_link_libraries(cactus PUBLIC ${COREML_FRAMEWORK} ${FOUNDATION_FRAMEWORK} ${ACCELERATE_FRAMEWORK})
endif()
Expand Down
34 changes: 33 additions & 1 deletion cactus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CACTUS_CURL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../libs/curl" CACHE PATH "Path to vendored libcurl artifacts")
set(CACTUS_XGRAMMAR_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../libs/xgrammar" CACHE PATH "Path to vendored xgrammar artifacts")

function(cactus_require_vendored_curl include_dir library_path platform_label)
if(NOT EXISTS "${include_dir}/curl/curl.h" OR NOT EXISTS "${library_path}")
Expand All @@ -37,6 +38,18 @@ function(cactus_require_vendored_curl include_dir library_path platform_label)
endif()
endfunction()

function(cactus_require_vendored_xgrammar include_dir library_path platform_label)
if(NOT EXISTS "${include_dir}/xgrammar/xgrammar.h" OR NOT EXISTS "${library_path}")
message(WARNING "==============================================================================")
message(WARNING " Vendored xgrammar is required for ${platform_label} builds but is missing.")
message(WARNING " Expected header: ${include_dir}/xgrammar/xgrammar.h")
message(WARNING " Expected library: ${library_path}")
message(WARNING " Populate libs/xgrammar from your local xgrammar build before running cactus build.")
message(WARNING "==============================================================================")
message(FATAL_ERROR "Missing vendored xgrammar artifacts for ${platform_label}")
endif()
endfunction()

if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch arm64 -march=armv8.2-a+fp16+simd+dotprod+i8mm -pthread -Wall -Wextra -pedantic -O3 -Wno-missing-field-initializers")
Expand All @@ -52,6 +65,9 @@ if(APPLE)
set(CACTUS_CURL_INCLUDE_DIR "${CACTUS_CURL_ROOT}/include")
set(CACTUS_CURL_LIBRARY_MACOS "${CACTUS_CURL_ROOT}/macos/libcurl.a")
cactus_require_vendored_curl("${CACTUS_CURL_INCLUDE_DIR}" "${CACTUS_CURL_LIBRARY_MACOS}" "macOS")
set(CACTUS_XGRAMMAR_INCLUDE_DIR "${CACTUS_XGRAMMAR_ROOT}/include")
set(CACTUS_XGRAMMAR_LIBRARY_MACOS "${CACTUS_XGRAMMAR_ROOT}/macos/libxgrammar.a")
cactus_require_vendored_xgrammar("${CACTUS_XGRAMMAR_INCLUDE_DIR}" "${CACTUS_XGRAMMAR_LIBRARY_MACOS}" "macOS")
find_library(COREML_FRAMEWORK CoreML REQUIRED)
find_library(FOUNDATION_FRAMEWORK Foundation REQUIRED)
find_library(ACCELERATE_FRAMEWORK Accelerate REQUIRED)
Expand All @@ -66,6 +82,10 @@ else()
__ARM_FEATURE_DOTPROD=1
__ARM_FEATURE_MATMUL_INT8=1
)

set(CACTUS_XGRAMMAR_INCLUDE_DIR "${CACTUS_XGRAMMAR_ROOT}/include")
set(CACTUS_XGRAMMAR_LIBRARY_LINUX_AARCH64 "${CACTUS_XGRAMMAR_ROOT}/linux/aarch64/libxgrammar.a")
cactus_require_vendored_xgrammar("${CACTUS_XGRAMMAR_INCLUDE_DIR}" "${CACTUS_XGRAMMAR_LIBRARY_LINUX_AARCH64}" "Linux ARM64")
endif()

file(GLOB ENGINE_SOURCES CONFIGURE_DEPENDS "engine/*.cpp")
Expand Down Expand Up @@ -129,9 +149,21 @@ function(configure_cactus_target target_name)
${SYSTEMCONFIGURATION_FRAMEWORK}
${CFNETWORK_FRAMEWORK}
${CACTUS_CURL_LIBRARY_MACOS}
${CACTUS_XGRAMMAR_LIBRARY_MACOS}
)
target_include_directories(${target_name} PUBLIC ${CACTUS_CURL_INCLUDE_DIR})
target_compile_definitions(${target_name} PRIVATE CACTUS_USE_CURL=1)
target_include_directories(${target_name} PUBLIC ${CACTUS_XGRAMMAR_INCLUDE_DIR})
target_compile_definitions(${target_name} PRIVATE CACTUS_USE_CURL=1 CACTUS_USE_XGRAMMAR=1)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_include_directories(${target_name} PUBLIC ${CACTUS_XGRAMMAR_INCLUDE_DIR})
target_link_libraries(${target_name} PUBLIC ${CACTUS_XGRAMMAR_LIBRARY_LINUX_AARCH64})
target_compile_definitions(${target_name} PRIVATE CACTUS_USE_XGRAMMAR=1)

if(CURL_FOUND)
target_include_directories(${target_name} PRIVATE ${CURL_INCLUDE_DIRS})
target_link_libraries(${target_name} PUBLIC ${CURL_LIBRARIES})
target_compile_definitions(${target_name} PRIVATE CACTUS_USE_CURL)
endif()
elseif(CURL_FOUND)
target_include_directories(${target_name} PRIVATE ${CURL_INCLUDE_DIRS})
target_link_libraries(${target_name} PUBLIC ${CURL_LIBRARIES})
Expand Down
Loading
Loading