Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[GLUTEN-6550] Fix build failure when BUILD_TESTS is enabled on macOS #6594

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# macOS. See https://github.com/boostorg/stacktrace/issues/88 and comments
# therein.
add_compile_definitions(_GNU_SOURCE)

# Only make default symbol visibility as 'default' when we want to build test
# or benchmark
if(BUILD_TESTS OR BUILD_BENCHMARKS)
add_compile_options(-fvisibility=default)
endif()
endif()

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KNOWN_WARNINGS}")
Expand Down
15 changes: 13 additions & 2 deletions cpp/core/benchmarks/CompressionBenchmark.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <parquet/arrow/reader.h>
#include <parquet/file_reader.h>
#include <sched.h>
#include <thread>

#include <chrono>
#include <iostream>
Expand Down Expand Up @@ -213,11 +214,21 @@ class BenchmarkCompression {
}

protected:
long setCpu(uint32_t cpuindex) {
void setCpu(uint32_t cpuindex) {
#ifndef __APPLE__
static const auto kTotalCores = std::thread::hardware_concurrency();
cpuindex = cpuindex % kTotalCores;
cpu_set_t cs;
CPU_ZERO(&cs);
CPU_SET(cpuindex, &cs);
return sched_setaffinity(0, sizeof(cs), &cs);
if (sched_setaffinity(0, sizeof(cs), &cs) == -1) {
LOG(WARNING) << "Error binding CPU " << std::to_string(cpuindex);
exit(EXIT_FAILURE);
}
#else
LOG(WARNING) << "Binding CPU is currently not supported on macOS." << std::endl;
exit(EXIT_FAILURE);
#endif
}

virtual void doCompress(
Expand Down
5 changes: 5 additions & 0 deletions cpp/velox/benchmarks/ColumnarToRowBenchmark.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,15 @@ class GoogleBenchmarkColumnarToRow {

protected:
long setCpu(uint32_t cpuindex) {
#ifndef __APPLE__
cpu_set_t cs;
CPU_ZERO(&cs);
CPU_SET(cpuindex, &cs);
return sched_setaffinity(0, sizeof(cs), &cs);
#else
LOG(WARNING) << "Binding CPU is currently not supported on macOS." << std::endl;
exit(EXIT_FAILURE);
#endif
}

velox::VectorPtr recordBatch2RowVector(const arrow::RecordBatch& rb) {
Expand Down
5 changes: 5 additions & 0 deletions cpp/velox/benchmarks/ParquetWriteBenchmark.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,15 @@ class GoogleBenchmarkParquetWrite {

protected:
long setCpu(uint32_t cpuindex) {
#ifndef __APPLE__
cpu_set_t cs;
CPU_ZERO(&cs);
CPU_SET(cpuindex, &cs);
return sched_setaffinity(0, sizeof(cs), &cs);
#else
LOG(WARNING) << "Binding CPU is currently not supported on macOS." << std::endl;
exit(EXIT_FAILURE);
#endif
}

std::shared_ptr<ColumnarBatch> recordBatch2VeloxColumnarBatch(const arrow::RecordBatch& rb) {
Expand Down
5 changes: 5 additions & 0 deletions cpp/velox/benchmarks/common/BenchmarkUtils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ std::shared_ptr<arrow::RecordBatchReader> createReader(const std::string& path)
#endif

void setCpu(uint32_t cpuindex) {
#ifndef __APPLE__
static const auto kTotalCores = std::thread::hardware_concurrency();
cpuindex = cpuindex % kTotalCores;
cpu_set_t cs;
Expand All @@ -149,6 +150,10 @@ void setCpu(uint32_t cpuindex) {
LOG(WARNING) << "Error binding CPU " << std::to_string(cpuindex);
exit(EXIT_FAILURE);
}
#else
LOG(WARNING) << "Binding CPU is currently not supported on macOS." << std::endl;
exit(EXIT_FAILURE);
#endif
}

arrow::Status
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function(add_velox_test TEST_EXEC)
endif()
add_executable(${TEST_EXEC} ${SOURCES} ${VELOX_TEST_COMMON_SRCS})
target_include_directories(
${TEST_EXEC} PRIVATE ${CMAKE_SOURCE_DIR}/velox ${CMAKE_SOURCE_DIR}/src
${TEST_EXEC} PRIVATE ${CMAKE_SOURCE_DIR}/src
${VELOX_BUILD_PATH}/_deps/duckdb-src/src/include)
target_link_libraries(${TEST_EXEC} velox GTest::gtest GTest::gtest_main
google::glog)
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/tests/FunctionTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ TEST_F(FunctionTest, getIdxFromNodeName) {

TEST_F(FunctionTest, getNameBeforeDelimiter) {
std::string functionSpec = "lte:fp64_fp64";
std::string_view funcName = SubstraitParser::getNameBeforeDelimiter(functionSpec);
std::string funcName = SubstraitParser::getNameBeforeDelimiter(functionSpec);
ASSERT_EQ(funcName, "lte");

functionSpec = "lte:";
Expand Down
6 changes: 3 additions & 3 deletions cpp/velox/tests/VeloxRowToColumnarTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ class VeloxRowToColumnarTest : public ::testing::Test, public test::VectorTestBa
uint8_t* address = columnarToRowConverter->getBufferAddress();
auto lengthVec = columnarToRowConverter->getLengths();

long lengthArr[lengthVec.size()];
std::vector<int64_t> int64Lengths(lengthVec.size());
for (int i = 0; i < lengthVec.size(); i++) {
lengthArr[i] = lengthVec[i];
int64Lengths[i] = lengthVec[i];
}

ArrowSchema cSchema;
toArrowSchema(vector->type(), pool(), &cSchema);
auto rowToColumnarConverter = std::make_shared<VeloxRowToColumnarConverter>(&cSchema, pool_);

auto cb = rowToColumnarConverter->convert(numRows, lengthArr, address);
auto cb = rowToColumnarConverter->convert(numRows, int64Lengths.data(), address);
auto vp = std::dynamic_pointer_cast<VeloxColumnarBatch>(cb)->getRowVector();
velox::test::assertEqualVectors(vector, vp);
}
Expand Down
Loading