Skip to content
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
1 change: 1 addition & 0 deletions ci/conda_env_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ brotli
bzip2
c-ares
cmake
cpu_features
double-conversion
flatbuffers
gflags
Expand Down
3 changes: 3 additions & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,9 @@ set(ARROW_LINK_LIBS ${double-conversion_LIBRARIES})
set(ARROW_STATIC_LINK_LIBS ${double-conversion_LIBRARIES})
set(ARROW_STATIC_INSTALL_INTERFACE_LIBS ${double-conversion_LIBRARIES})

list(APPEND ARROW_STATIC_LINK_LIBS cpu_features::cpu_features)
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS cpu_features::cpu_features)

if(ARROW_WITH_URIPARSER)
list(APPEND ARROW_STATIC_LINK_LIBS uriparser::uriparser)
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS uriparser::uriparser)
Expand Down
37 changes: 37 additions & 0 deletions cpp/cmake_modules/Findcpu_features.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

if(cpu_features_ROOT)
find_library(cpu_features_LIB
NAMES cpu_features
PATHS ${cpu_features_ROOT}
NO_DEFAULT_PATH
PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
else()
find_library(cpu_features_LIB NAMES cpu_features)
endif()

find_package_handle_standard_args(cpu_features REQUIRED_VARS cpu_features_LIB
cpu_features_INCLUDE_DIR)

if(cpu_features_FOUND)
add_library(cpu_features::cpu_features UNKNOWN IMPORTED)
set_target_properties(cpu_features::cpu_features
PROPERTIES IMPORTED_LOCATION "${cpu_features_LIB}"
INTERFACE_INCLUDE_DIRECTORIES
"${cpu_features_INCLUDE_DIR}")
endif()
61 changes: 60 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
Thrift
uriparser
ZLIB
ZSTD)
ZSTD
cpu_features)

# TODO(wesm): External GTest shared libraries are not currently
# supported when building with MSVC because of the way that
Expand Down Expand Up @@ -161,6 +162,8 @@ macro(build_dependency DEPENDENCY_NAME)
build_zlib()
elseif("${DEPENDENCY_NAME}" STREQUAL "ZSTD")
build_zstd()
elseif("${DEPENDENCY_NAME}" STREQUAL "cpu_features")
build_cpu_features()
else()
message(FATAL_ERROR "Unknown thirdparty dependency to build: ${DEPENDENCY_NAME}")
endif()
Expand Down Expand Up @@ -414,6 +417,12 @@ else()
set(BZIP2_SOURCE_URL "https://fossies.org/linux/misc/bzip2-${BZIP2_VERSION}.tar.gz")
endif()

if(DEFINED ENV{ARROW_CPU_FEATURES_URL})
set(CPU_FEATURES_SOURCE_URL "$ENV{ARROW_CPU_FEATURES_URL}")
else()
set(CPU_FEATURES_SOURCE_URL "https://github.com/google/cpu_features/archive/${CPU_FEATURES_VERSION}.tar.gz")
endif()

# ----------------------------------------------------------------------
# ExternalProject options

Expand Down Expand Up @@ -2368,6 +2377,56 @@ if(ARROW_ORC)
message(STATUS "Found ORC headers: ${ORC_INCLUDE_DIR}")
endif()

# ----------------------------------------------------------------------
# cpu_features
macro(build_cpu_features)
message(STATUS "Building cpu_features from source")
set(CPU_FEATURES_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/cpu_features_ep-install")

set(CPU_FEATURES_CMAKE_ARGS
${EP_COMMON_TOOLCHAIN}
"-DCMAKE_INSTALL_PREFIX=${CPU_FEATURES_PREFIX}"
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR})

if(MSVC)
set(CPU_FEATURES_STATIC_LIB "${CPU_FEATURES_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cpu_features_static.lib")
else()
set(CPU_FEATURES_STATIC_LIB "${CPU_FEATURES_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libcpu_features.a")
endif()

externalproject_add(cpu_features_ep
${EP_LOG_OPTIONS}
CMAKE_ARGS ${CPU_FEATURES_CMAKE_ARGS}
INSTALL_DIR ${CPU_FEATURES_PREFIX}
URL ${CPU_FEATURES_SOURCE_URL}
BUILD_BYPRODUCTS "${CPU_FEATURES_STATIC_LIB}")

file(MAKE_DIRECTORY "${CPU_FEATURES_PREFIX}/include")

add_library(cpu_features::cpu_features STATIC IMPORTED)
set_target_properties(cpu_features::cpu_features
PROPERTIES IMPORTED_LOCATION "${CPU_FEATURES_STATIC_LIB}"
INTERFACE_INCLUDE_DIRECTORIES "${CPU_FEATURES_PREFIX}/include")

add_dependencies(toolchain cpu_features_ep)
add_dependencies(cpu_features::cpu_features cpu_features_ep)
endmacro()

set(ARROW_CPU_FEATURES_REQUIRED_VERSION "0.4.0")
if(cpu_features_SOURCE STREQUAL "AUTO")
find_package(cpu_features ${ARROW_CPU_FEATURES_REQUIRED_VERSION} QUIET)
if(NOT cpu_features_FOUND)
build_cpu_features()
endif()
elseif(cpu_features_SOURCE STREQUAL "BUNDLED")
build_cpu_features()
endif()

get_target_property(cpu_features_INCLUDE_DIR cpu_features::cpu_features
INTERFACE_INCLUDE_DIRECTORIES)
include_directories(SYSTEM ${cpu_features_INCLUDE_DIR})

# Write out the package configurations.

configure_file("src/arrow/util/config.h.cmake" "src/arrow/util/config.h")
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace arrow {
namespace compute {

FunctionContext::FunctionContext(MemoryPool* pool)
: pool_(pool), cpu_info_(internal::CpuInfo::GetInstance()) {}
: pool_(pool), cpu_info_(&internal::CpuInfo::GetInstance()) {}

MemoryPool* FunctionContext::memory_pool() const { return pool_; }

Expand Down
Loading