Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
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 09faaf9
Add simdjson alias target
Reranko05 b265939
Forward simdjson_SOURCE to CMake
Reranko05 9ba3e64
Disable JSON on AppleClang < 22
Reranko05 9921999
Add bundled in simdjson
Reranko05 3432892
Disable Arrow json for MacOS 11.3 SDK
Reranko05 179a1a2
Disable simdjson concepts for MacOS 11.3 SDK
Reranko05 b785ee4
Use bundled simdjson for Windows wheel builds
Reranko05 55686e5
Revert "Use bundled simdjson for Windows wheel builds"
Reranko05 e470cf0
Update Windows wheel image revision
Reranko05 f58e196
Add comments
Reranko05 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -410,6 +410,15 @@ if(ARROW_AZURE) | ||
| set(ARROW_WITH_AZURE_SDK ON) | ||
| endif() | ||
| # 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() | ||
Reranko05 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| if(ARROW_JSON OR ARROW_FLIGHT_SQL_ODBC) | ||
| set(ARROW_WITH_RAPIDJSON ON) | ||
| endif() | ||
| @@ -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) | ||
| @@ -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) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.