Skip to content

Commit c53b08e

Browse files
committed
Fix benchmarks; try gcc/clang compat
1 parent 6ffefef commit c53b08e

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

cpp/src/arrow/util/byte_stream_split_internal.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,9 @@ inline void ByteStreamSplitDecodeScalarDynamic(const uint8_t* data, int width,
452452
}
453453

454454
template <int kNumStreams>
455-
void ByteStreamSplitDecodeSimdDispatch(const uint8_t* data, int width, int64_t num_values,
456-
int64_t stride, uint8_t* out);
455+
ARROW_EXPORT void ByteStreamSplitDecodeSimdDispatch(const uint8_t* data, int width,
456+
int64_t num_values, int64_t stride,
457+
uint8_t* out);
457458

458459
extern template ARROW_TEMPLATE_EXPORT void ByteStreamSplitDecodeSimdDispatch<2>(
459460
const uint8_t*, int, int64_t, int64_t, uint8_t*);

cpp/src/arrow/util/visibility.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
# ifndef ARROW_NO_EXPORT
6868
# define ARROW_NO_EXPORT [[gnu::visibility("hidden")]]
6969
# endif
70+
# if defined(__clang__)
71+
# define ARROW_TEMPLATE_EXPORT
72+
# else
73+
# define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
74+
# endif
7075
# else
7176
// Not C++, or not gcc/clang
7277
# ifndef ARROW_EXPORT
@@ -75,10 +80,10 @@
7580
# ifndef ARROW_NO_EXPORT
7681
# define ARROW_NO_EXPORT
7782
# endif
83+
# define ARROW_TEMPLATE_EXPORT
7884
# endif
7985

8086
# define ARROW_FRIEND_EXPORT
81-
# define ARROW_TEMPLATE_EXPORT ARROW_EXPORT
8287

8388
// [[gnu::visibility("default")]] even when #included by a non-arrow source
8489
# define ARROW_FORCE_EXPORT [[gnu::visibility("default")]]

cpp/src/parquet/meson.build

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ if needs_parquet_encryption
268268
}
269269
endif
270270

271-
parquet_test_dep = [parquet_dep, arrow_test_dep, thrift_dep]
272-
273271
if get_option('default_library') != 'static'
274272
parquet_test_support_lib = static_library(
275273
'parquet-test-support',
@@ -280,9 +278,18 @@ if get_option('default_library') != 'static'
280278
parquet_test_support_dep = declare_dependency(
281279
link_with: [parquet_test_support_lib],
282280
)
283-
parquet_test_dep += [parquet_test_support_dep]
281+
else
282+
parquet_test_support_dep = declare_dependency()
284283
endif
285284

285+
286+
parquet_test_dep = [
287+
parquet_dep,
288+
parquet_test_support_dep,
289+
arrow_test_dep,
290+
thrift_dep,
291+
]
292+
286293
foreach key, val : parquet_tests
287294
test_name = 'parquet-@0@'.format(key)
288295
exc = executable(
@@ -313,7 +320,12 @@ parquet_benchmarks = {
313320
'size_stats_benchmark': {'sources': files('arrow/size_stats_benchmark.cc')},
314321
}
315322

316-
parquet_benchmark_dep = [parquet_dep, arrow_benchmark_dep, thrift_dep]
323+
parquet_benchmark_dep = [
324+
parquet_dep,
325+
parquet_test_support_dep,
326+
arrow_benchmark_dep,
327+
thrift_dep,
328+
]
317329

318330
foreach key, val : parquet_benchmarks
319331
benchmark_name = 'parquet-@0@'.format(key)

0 commit comments

Comments
 (0)