Skip to content

GH-50581: [C++][R] Use bundled simdjson for C++ wrapper builds #50587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rok merged 11 commits into from
Jul 24, 2026
+20 −5
Merged

GH-50581: [C++][R] Use bundled simdjson for C++ wrapper builds #50587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9864597
Use bundled simdjson by default
Reranko05 Jul 22, 2026
09faaf9
Add simdjson alias target
Reranko05 Jul 23, 2026
b265939
Forward simdjson_SOURCE to CMake
Reranko05 Jul 23, 2026
9ba3e64
Disable JSON on AppleClang < 22
Reranko05 Jul 24, 2026
9921999
Add bundled in simdjson
Reranko05 Jul 24, 2026
3432892
Disable Arrow json for MacOS 11.3 SDK
Reranko05 Jul 24, 2026
179a1a2
Disable simdjson concepts for MacOS 11.3 SDK
Reranko05 Jul 24, 2026
b785ee4
Use bundled simdjson for Windows wheel builds
Reranko05 Jul 24, 2026
55686e5
Revert "Use bundled simdjson for Windows wheel builds"
Reranko05 Jul 24, 2026
e470cf0
Update Windows wheel image revision
Reranko05 Jul 24, 2026
f58e196
Add comments
Reranko05 Jul 24, 2026
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
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, u
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-07-13
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-07-13
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-07-24
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-07-24
16 changes: 15 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,15 @@ if(ARROW_AZURE)
set(ARROW_WITH_AZURE_SDK ON)
endif()

Comment thread
Reranko05 marked this conversation as resolved.
# The macOS 11.3 SDK has incomplete C++20 concepts support, which prevents
# simdjson headers from compiling. Disable simdjson concepts for this SDK.
if(ARROW_JSON
AND CMAKE_OSX_SYSROOT
AND CMAKE_OSX_SYSROOT MATCHES "MacOSX11\\.3\\.sdk$")
message(STATUS "Disabling simdjson concepts for macOS SDK 11.3")
add_compile_definitions(SIMDJSON_CONCEPT_DISABLED=1)
endif()
Comment thread
Reranko05 marked this conversation as resolved.

if(ARROW_JSON OR ARROW_FLIGHT_SQL_ODBC)
set(ARROW_WITH_RAPIDJSON ON)
endif()
Expand Down Expand Up @@ -2816,7 +2825,7 @@ function(build_simdjson)
TRUE
PARENT_SCOPE)

list(APPEND ARROW_BUNDLED_STATIC_LIBS simdjson::simdjson)
list(APPEND ARROW_BUNDLED_STATIC_LIBS simdjson)
set(ARROW_BUNDLED_STATIC_LIBS
"${ARROW_BUNDLED_STATIC_LIBS}"
PARENT_SCOPE)
Expand All @@ -2833,6 +2842,11 @@ if(ARROW_WITH_SIMDJSON)
${ARROW_SIMDJSON_REQUIRED_VERSION}
IS_RUNTIME_DEPENDENCY
FALSE)
if(SIMDJSON_VENDORED)
add_library(arrow::simdjson ALIAS simdjson)
else()
add_library(arrow::simdjson ALIAS simdjson::simdjson)
endif()
endif()

function(build_rapidjson)
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ if(ARROW_JSON)
json/parser.cc
json/reader.cc)
foreach(ARROW_JSON_TARGET ${ARROW_JSON_TARGETS})
target_link_libraries(${ARROW_JSON_TARGET} PRIVATE RapidJSON simdjson::simdjson)
target_link_libraries(${ARROW_JSON_TARGET} PRIVATE RapidJSON arrow::simdjson)
endforeach()
else()
set(ARROW_JSON_TARGET_SHARED)
Expand Down
3 changes: 2 additions & 1 deletion r/inst/build_arrow_static.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ ${CMAKE_WRAPPER} ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \
-DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} \
-Dre2_SOURCE=${re2_SOURCE:-BUNDLED} \
-Dabsl_SOURCE=${absl_SOURCE:-BUNDLED} \
-Dre2_SOURCE=${re2_SOURCE:-BUNDLED} \
-Dsimdjson_SOURCE=${simdjson_SOURCE:-BUNDLED} \
-Dxsimd_SOURCE=${xsimd_SOURCE:-} \
-Dzstd_SOURCE=${zstd_SOURCE:-} \
${EXTRA_CMAKE_FLAGS} \
Expand Down
Loading