Repository: kudu Updated Branches: refs/heads/master 88755e98d -> 1a0099f91
Fix bitshuffle arch-wrapper code to build on OSX OSX doesn't have objcopy, so we don't have the avx2 symbols available. This hard-codes the non-AVX2 symbol usage on OSX. Change-Id: If011c166d33e8900eceb5090279d014226907e2a Reviewed-on: http://gerrit.cloudera.org:8080/5253 Reviewed-by: Adar Dembo <[email protected]> Reviewed-by: David Ribeiro Alves <[email protected]> Tested-by: David Ribeiro Alves <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/1a0099f9 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/1a0099f9 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/1a0099f9 Branch: refs/heads/master Commit: 1a0099f91e6409d80484e58eefe33d68f1891d83 Parents: 88755e9 Author: Todd Lipcon <[email protected]> Authored: Mon Nov 28 17:18:44 2016 -0800 Committer: David Ribeiro Alves <[email protected]> Committed: Tue Nov 29 01:46:54 2016 +0000 ---------------------------------------------------------------------- src/kudu/cfile/bitshuffle_arch_wrapper.cc | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/1a0099f9/src/kudu/cfile/bitshuffle_arch_wrapper.cc ---------------------------------------------------------------------- diff --git a/src/kudu/cfile/bitshuffle_arch_wrapper.cc b/src/kudu/cfile/bitshuffle_arch_wrapper.cc index c5ce71a..0565484 100644 --- a/src/kudu/cfile/bitshuffle_arch_wrapper.cc +++ b/src/kudu/cfile/bitshuffle_arch_wrapper.cc @@ -57,6 +57,7 @@ decltype(&bshuf_decompress_lz4) g_bshuf_decompress_lz4; // the cost of a 'std::once' call. __attribute__((constructor)) void SelectBitshuffleFunctions() { +#ifndef __APPLE__ if (CPU().has_avx2()) { g_bshuf_compress_lz4_bound = bshuf_compress_lz4_bound_avx2; g_bshuf_compress_lz4 = bshuf_compress_lz4_avx2; @@ -66,6 +67,11 @@ void SelectBitshuffleFunctions() { g_bshuf_compress_lz4 = bshuf_compress_lz4; g_bshuf_decompress_lz4 = bshuf_decompress_lz4; } +#else + g_bshuf_compress_lz4_bound = bshuf_compress_lz4_bound; + g_bshuf_compress_lz4 = bshuf_compress_lz4; + g_bshuf_decompress_lz4 = bshuf_decompress_lz4; +#endif } int64_t compress_lz4(void* in, void* out, size_t size,
