GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

Closed
WillAyd wants to merge 4 commits into from
Closed

GH-46827: [C++] Update Meson Configuration for compute shared lib #46830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9e7df3
GH-46827: [C++] Update Meson Configuration for compute shared lib
WillAyd Jun 16, 2025
aff951f
kou feedback
WillAyd Jun 17, 2025
64875bf
try win compat
WillAyd Jun 17, 2025
df5e2e3
limit compat scope to only 32 bit windows
WillAyd Jun 17, 2025
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
20 changes: 16 additions & 4 deletions cpp/src/arrow/acero/meson.build
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
'arrow-acero',
sources: arrow_acero_srcs,
dependencies: [arrow_dep],
dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
exc = executable(
'arrow-acero-@0@'.format(key),
sources: val['sources'] + arrow_acero_testing_sources,
dependencies: [arrow_acero_dep, arrow_test_dep],
dependencies: [arrow_acero_dep, arrow_compute_test_dep],
)
test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
exc = executable(
key,
sources: val['sources'] + arrow_acero_testing_sources,
dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
dependencies: [
arrow_acero_dep,
arrow_compute_test_dep,
arrow_benchmark_dep,
gmock_dep,
],
)
benchmark(key, exc)
endforeach

pkg.generate(
filebase: 'arrow-acero',
name: 'Apache Arrow Acero Engine',
description: 'Apache Arrow\'s Acero Engine',
requires: ['arrow-compute'],
)
8 changes: 7 additions & 1 deletion cpp/src/arrow/c/meson.build
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
arrow_c_bridge_deps = [arrow_compute_test_dep]
else
arrow_c_bridge_deps = []
endif

exc = executable(
'arrow-c-bridge-test',
sources: ['bridge_test.cc'],
dependencies: [arrow_test_dep],
dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down
13 changes: 10 additions & 3 deletions cpp/src/arrow/compute/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
# Even though this is still just an object library we still need to "link"
# arrow_compute_core_testing so that is also included correctly
target_link_libraries(arrow_compute_testing
PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
PUBLIC ${ARROW_GTEST_GTEST_MAIN})
if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
target_link_libraries(arrow_compute_testing
PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
PUBLIC ${ARROW_GTEST_GTEST_MAIN})
else()
target_link_libraries(arrow_compute_testing
PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
PUBLIC ${ARROW_GTEST_GTEST})
endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down
16 changes: 5 additions & 11 deletions cpp/src/arrow/compute/kernels/meson.build
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
'arrow-scalar-cast-test',
sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
dependencies: [arrow_test_dep],
sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
exc = executable(
key,
sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
sources: val['sources'] + kernel_testing_srcs,
dependencies: [arrow_compute_test_dep],
)
test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
exc = executable(
key,
sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
sources: val['sources'] + kernel_testing_srcs,
dependencies: [arrow_compute_test_dep],
)
test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
'arrow-compute-aggregate-test',
sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
sources: ['aggregate_test.cc'] + kernel_testing_srcs,
dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down
69 changes: 49 additions & 20 deletions cpp/src/arrow/compute/meson.build
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
pkg.generate(
filebase: 'arrow-compute',
name: 'Apache Arrow Compute',
description: 'All compute kernels for Apache Arrow',
name: 'Apache Arrow Compute Kernels',
description: 'Apache Arrow\'s Compute Kernels',
requires: ['arrow'],
)
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
arrow_compute_testing_srcs += files('test_util_internal.cc')
arrow_compute_core_test_lib = library(
'arrow-compute-core-testing',
sources: files('test_util_internal.cc'),
dependencies: arrow_test_dep,
)
arrow_compute_core_test_dep = declare_dependency(
link_with: arrow_compute_core_test_lib,
)
else
arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
arrow_compute_testing_lib = library(
'arrow-compute-testing',
sources: files('test_env.cc'),
dependencies: [
arrow_compute_dep,
arrow_compute_core_test_dep,
arrow_test_dep_no_main,
],
)
arrow_compute_test_dep = declare_dependency(
link_with: arrow_compute_testing_lib,
dependencies: [
arrow_compute_dep,
arrow_compute_core_test_dep,
arrow_test_dep_no_main,
],
)
else
arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
'exec_test.cc',
'kernel_test.cc',
'registry_test.cc',
] + arrow_compute_testing_srcs,
dependencies: [arrow_test_dep],
],
dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
'arrow-compute-expression-test': {
'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
},
'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
'arrow-compute-row-test': {
'sources': [
'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
'row/row_encoder_internal_test.cc',
'row/row_test.cc',
'util_internal_test.cc',
] + arrow_compute_testing_srcs,
],
},
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615

@koukouJun 17, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?

@WillAydWillAydJun 17, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?

@koukouJun 18, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?

if needs_compute
foreach key, val : compute_tests
exc = executable(
key,
sources: val['sources'],
dependencies: [arrow_test_dep],
)
test(key, exc)
endforeach
endif
foreach key, val : compute_tests
exc = executable(
key,
sources: val['sources'],
dependencies: [arrow_compute_test_dep],
)
test(key, exc)
endforeach

exc = executable(
'arrow-compute-function-benchmark',
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/row/meson.build
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
exc = executable(
'arrow-compute-grouper-benchmark',
sources: ['grouper_benchmark.cc'],
dependencies: [arrow_benchmark_dep],
dependencies: [arrow_compute_dep, arrow_benchmark_dep],
)
endif
10 changes: 10 additions & 0 deletions cpp/src/arrow/compute/test_env.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
return RUN_ALL_TESTS();
}
#endif
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
GH-46827: [C++] Update Meson Configuration for compute shared lib#46830

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

 Closed

WillAyd
wants to merge
4
commits into

from

 Closed


GH-46827: [C++] Update Meson Configuration for compute shared lib
#46830
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b9e7df3

GH-46827: [C++] Update Meson Configuration for compute shared lib


WillAyd Jun 16, 2025
aff951f

kou feedback


WillAyd Jun 17, 2025
64875bf

try win compat


WillAyd Jun 17, 2025
df5e2e3

limit compat scope to only 32 bit windows


WillAyd Jun 17, 2025

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


20 changes: 16 additions & 4 deletions
cpp/src/arrow/acero/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,12 +80,12 @@ arrow_acero_srcs = [
arrow_acero_lib = library(
 'arrow-acero',
 sources: arrow_acero_srcs,
 dependencies: [arrow_dep],
 dependencies: [arrow_compute_dep, arrow_dep],
)

arrow_acero_dep = declare_dependency(link_with: [arrow_acero_lib])

arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc'] + arrow_compute_testing_srcs
arrow_acero_testing_sources = ['test_nodes.cc', 'test_util_internal.cc']

arrow_acero_tests = {
 'plan-test': {'sources': ['plan_test.cc', 'test_nodes_test.cc']},
Expand All@@ -110,7 +110,7 @@ foreach key, val : arrow_acero_tests
 exc = executable(
 'arrow-acero-@0@'.format(key),
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_test_dep],
 dependencies: [arrow_acero_dep, arrow_compute_test_dep],
 )
 test(key, exc)
endforeach
Expand All@@ -133,7 +133,19 @@ foreach key, val : arrow_acero_benchmarks
 exc = executable(
 key,
 sources: val['sources'] + arrow_acero_testing_sources,
 dependencies: [arrow_acero_dep, arrow_benchmark_dep, gmock_dep],
 dependencies: [
 arrow_acero_dep,
 arrow_compute_test_dep,
 arrow_benchmark_dep,
 gmock_dep,
 ],
 )
 benchmark(key, exc)
endforeach

pkg.generate(
 filebase: 'arrow-acero',
 name: 'Apache Arrow Acero Engine',
 description: 'Apache Arrow\'s Acero Engine',
 requires: ['arrow-compute'],
)

8 changes: 7 additions & 1 deletion
cpp/src/arrow/c/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,16 @@
# specific language governing permissions and limitations
# under the License.

if needs_compute
 arrow_c_bridge_deps = [arrow_compute_test_dep]
else
 arrow_c_bridge_deps = []
endif

exc = executable(
 'arrow-c-bridge-test',
 sources: ['bridge_test.cc'],
 dependencies: [arrow_test_dep],
 dependencies: arrow_c_bridge_deps,
)
test('arrow-c-bridge-test', exc)

Expand Down

13 changes: 10 additions & 3 deletions
cpp/src/arrow/compute/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,16 @@ if(ARROW_TESTING AND ARROW_COMPUTE)
 add_library(arrow_compute_testing OBJECT ${ARROW_COMPUTE_TESTING_SRCS})
 # Even though this is still just an object library we still need to "link"
 # arrow_compute_core_testing so that is also included correctly
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 if(WIN32 AND (CMAKE_SIZEOF_VOID_P EQUAL 4))
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST_MAIN})
 else()
 target_link_libraries(arrow_compute_testing
 PUBLIC $<TARGET_OBJECTS:arrow_compute_core_testing>
 PUBLIC ${ARROW_GTEST_GTEST})
 endif()

endif()

set(ARROW_COMPUTE_TEST_PREFIX "arrow-compute")
Expand Down

16 changes: 5 additions & 11 deletions
cpp/src/arrow/compute/kernels/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,11 @@ endif

exc = executable(
 'arrow-scalar-cast-test',
 sources: ['scalar_cast_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 dependencies: [arrow_test_dep],
 sources: ['scalar_cast_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
)
test('arrow-scalar-cast-test', exc)

if needs_compute
 arrow_compute_test_dep = declare_dependency(dependencies: [arrow_test_dep])
else
 arrow_compute_test_dep = disabler()
endif

# ----------------------------------------------------------------------
# Scalar kernels

Expand DownExpand Up@@ -71,7 +65,7 @@ scalar_kernel_tests = {
foreach key, val : scalar_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -126,7 +120,7 @@ vector_kernel_tests = {
foreach key, val : vector_kernel_tests
 exc = executable(
 key,
 sources: val['sources'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: val['sources'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
Expand DownExpand Up@@ -157,7 +151,7 @@ endforeach
# Aggregates
exc = executable(
 'arrow-compute-aggregate-test',
 sources: ['aggregate_test.cc'] + arrow_compute_testing_srcs + kernel_testing_srcs,
 sources: ['aggregate_test.cc'] + kernel_testing_srcs,
 dependencies: [arrow_compute_test_dep, filesystem_dep],
)
test('arrow-compute-aggregate-test', exc)
Expand Down

69 changes: 49 additions & 20 deletions
cpp/src/arrow/compute/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,15 +41,48 @@ install_headers(
if needs_compute
 pkg.generate(
 filebase: 'arrow-compute',
 name: 'Apache Arrow Compute',
 description: 'All compute kernels for Apache Arrow',
 name: 'Apache Arrow Compute Kernels',
 description: 'Apache Arrow\'s Compute Kernels',
 requires: ['arrow'],
 )
endif

arrow_compute_testing_srcs = []
# Define arrow_compute_core_testing object library for common test files requiring
# only core compute. No extra kernels are required.
if needs_testing
 arrow_compute_testing_srcs += files('test_util_internal.cc')
 arrow_compute_core_test_lib = library(
 'arrow-compute-core-testing',
 sources: files('test_util_internal.cc'),
 dependencies: arrow_test_dep,
 )
 arrow_compute_core_test_dep = declare_dependency(
 link_with: arrow_compute_core_test_lib,
 )
else
 arrow_compute_core_test_dep = disabler()
endif

# Define arrow_compute_testing object library for test files requiring extra kernels.
if needs_testing and needs_compute
 arrow_compute_testing_lib = library(
 'arrow-compute-testing',
 sources: files('test_env.cc'),
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
 arrow_compute_test_dep = declare_dependency(
 link_with: arrow_compute_testing_lib,
 dependencies: [
 arrow_compute_dep,
 arrow_compute_core_test_dep,
 arrow_test_dep_no_main,
 ],
 )
else
 arrow_compute_test_dep = disabler()
endif

exc = executable(
Expand All@@ -59,15 +92,13 @@ exc = executable(
 'exec_test.cc',
 'kernel_test.cc',
 'registry_test.cc',
 ] + arrow_compute_testing_srcs,
 dependencies: [arrow_test_dep],
 ],
 dependencies: [arrow_compute_core_test_dep, arrow_test_dep],
)
test('arrow-internals-test', exc)

compute_tests = {
 'arrow-compute-expression-test': {
 'sources': ['expression_test.cc'] + arrow_compute_testing_srcs,
 },
 'arrow-compute-expression-test': {'sources': ['expression_test.cc']},
 'arrow-compute-row-test': {
 'sources': [
 'key_hash_test.cc',
Expand All@@ -77,7 +108,7 @@ compute_tests = {
 'row/row_encoder_internal_test.cc',
 'row/row_test.cc',
 'util_internal_test.cc',
 ] + arrow_compute_testing_srcs,
 ],
 },
}

Expand All@@ -96,16 +127,14 @@ compute_tests = {
# - value_counts
#
# Also see: GH-34388, GH-34615
@koukouJun 17, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update this comment block?
@WillAydWillAydJun 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't step through all of the kernels but this comment still holds true, no?
@koukouJun 18, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, removing the if needs_compute is just by introducing arrow_compute_test_dep, right?
if needs_compute
 foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_test_dep],
 )
 test(key, exc)
 endforeach
endif
foreach key, val : compute_tests
 exc = executable(
 key,
 sources: val['sources'],
 dependencies: [arrow_compute_test_dep],
 )
 test(key, exc)
endforeach

exc = executable(
 'arrow-compute-function-benchmark',
Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/compute/row/meson.build

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,6 @@ if needs_compute
 exc = executable(
 'arrow-compute-grouper-benchmark',
 sources: ['grouper_benchmark.cc'],
 dependencies: [arrow_benchmark_dep],
 dependencies: [arrow_compute_dep, arrow_benchmark_dep],
 )
endif

10 changes: 10 additions & 0 deletions
cpp/src/arrow/compute/test_env.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,18 @@ class ComputeKernelEnvironment : public ::testing::Environment {

} // namespace

#if defined(_WIN32) && !defined(_WIN64)
// Initialize the compute module
::testing::Environment* compute_kernels_env =
 ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
#endif

} // namespace arrow::compute

#if !(defined(_WIN32) && !defined(_WIN64))
int main(int argc, char** argv) {
 ::testing::InitGoogleTest(&argc, argv);
 ::testing::AddGlobalTestEnvironment(new arrow::compute::ComputeKernelEnvironment);
 return RUN_ALL_TESTS();
}
#endif
Loading