You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ap...@apache.org on 2019/06/03 07:59:58 UTC
[arrow] branch master updated: ARROW-5441: [C++] Implement
FindArrowFlight.cmake
This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 4d60c8c ARROW-5441: [C++] Implement FindArrowFlight.cmake
4d60c8c is described below
commit 4d60c8c0aaad5472d9887ad933a04a5c80d7f6db
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Mon Jun 3 09:59:50 2019 +0200
ARROW-5441: [C++] Implement FindArrowFlight.cmake
Also make Python Flight support compatible with PYARROW_BUNDLE_ARROW_CPP.
Author: Antoine Pitrou <an...@python.org>
Closes #4415 from pitrou/ARROW-5441-find-arrow-flight and squashes the following commits:
c40fdcf91 <Antoine Pitrou> ARROW-5441: Implement FindArrowFlight.cmake
---
cpp/cmake_modules/FindArrow.cmake | 3 +-
cpp/cmake_modules/FindArrowCuda.cmake | 2 +-
cpp/cmake_modules/FindArrowFlight.cmake | 122 ++++++++++++++++++++++++++++++++
python/CMakeLists.txt | 37 ++++++----
python/setup.py | 2 +-
5 files changed, 147 insertions(+), 19 deletions(-)
diff --git a/cpp/cmake_modules/FindArrow.cmake b/cpp/cmake_modules/FindArrow.cmake
index 1b9125f..73a69b3 100644
--- a/cpp/cmake_modules/FindArrow.cmake
+++ b/cpp/cmake_modules/FindArrow.cmake
@@ -46,13 +46,12 @@ if("$ENV{ARROW_HOME}" STREQUAL "")
endif()
set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS})
set(ARROW_LIBS ${ARROW_LIBRARY_DIRS})
+ set(ARROW_SEARCH_HEADER_PATHS ${ARROW_INCLUDE_DIR})
set(ARROW_SEARCH_LIB_PATH ${ARROW_LIBRARY_DIRS})
endif()
else()
set(ARROW_HOME "$ENV{ARROW_HOME}")
-
set(ARROW_SEARCH_HEADER_PATHS ${ARROW_HOME}/include)
-
set(ARROW_SEARCH_LIB_PATH ${ARROW_HOME}/lib)
find_path(ARROW_INCLUDE_DIR arrow/array.h
diff --git a/cpp/cmake_modules/FindArrowCuda.cmake b/cpp/cmake_modules/FindArrowCuda.cmake
index 8db6a14..ad10b38 100644
--- a/cpp/cmake_modules/FindArrowCuda.cmake
+++ b/cpp/cmake_modules/FindArrowCuda.cmake
@@ -74,7 +74,7 @@ if(MSVC)
PATHS ${ARROW_HOME}
PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
NO_DEFAULT_PATH)
- get_filename_component(ARROW_CUDA_SHARED_LIBS ${ARROW_CUDA_SHARED_LIBRARIES} PATH)
+ get_filename_component(ARROW_CUDA_SHARED_LIBS ${ARROW_CUDA_SHARED_LIBRARIES} DIRECTORY)
endif()
if(ARROW_CUDA_INCLUDE_DIR AND ARROW_CUDA_LIBS)
diff --git a/cpp/cmake_modules/FindArrowFlight.cmake b/cpp/cmake_modules/FindArrowFlight.cmake
new file mode 100644
index 0000000..3e3d809
--- /dev/null
+++ b/cpp/cmake_modules/FindArrowFlight.cmake
@@ -0,0 +1,122 @@
+# 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.
+
+# - Find ARROW Flight (arrow/flight/api.h, libarrow_flight.a, libarrow_flight.so)
+#
+# This module requires Arrow from which it uses
+# ARROW_FOUND
+# ARROW_SEARCH_HEADER_PATHS
+# ARROW_SEARCH_LIB_PATH
+# ARROW_HOME
+#
+# This module defines
+# ARROW_FLIGHT_FOUND, whether Flight has been found
+# ARROW_FLIGHT_INCLUDE_DIR, directory containing headers
+# ARROW_FLIGHT_LIBS, directory containing Flight libraries
+# ARROW_FLIGHT_STATIC_LIB, path to libarrow_flight.a
+# ARROW_FLIGHT_SHARED_LIB, path to libarrow_flight.so
+# ARROW_FLIGHT_SHARED_IMP_LIB, path to libarrow_flight's import library (MSVC only)
+
+include(FindPkgConfig)
+include(GNUInstallDirs)
+
+if(NOT DEFINED ARROW_FOUND)
+ if(ArrowFlight_FIND_REQUIRED)
+ find_package(Arrow REQUIRED)
+ else()
+ find_package(Arrow)
+ endif()
+endif()
+
+if(NOT ARROW_FOUND)
+ set(ARROW_FLIGHT_FOUND FALSE)
+ return()
+endif()
+
+find_path(ARROW_FLIGHT_INCLUDE_DIR arrow/flight/api.h
+ PATHS ${ARROW_SEARCH_HEADER_PATHS}
+ PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES}
+ NO_DEFAULT_PATH)
+
+if(NOT (ARROW_FLIGHT_INCLUDE_DIR STREQUAL ARROW_INCLUDE_DIR))
+ set(ARROW_FLIGHT_WARN_MSG "Mismatch of Arrow and Arrow Flight include directories:")
+ set(ARROW_FLIGHT_WARN_MSG
+ "${ARROW_FLIGHT_WARN_MSG} ARROW_INCLUDE_DIR=${ARROW_INCLUDE_DIR}")
+ set(ARROW_FLIGHT_WARN_MSG
+ "${ARROW_FLIGHT_WARN_MSG} ARROW_FLIGHT_INCLUDE_DIR=${ARROW_FLIGHT_INCLUDE_DIR}")
+ message(WARNING ${ARROW_FLIGHT_WARN_MSG})
+endif()
+
+find_library(ARROW_FLIGHT_LIB_PATH
+ NAMES arrow_flight
+ PATHS ${ARROW_SEARCH_LIB_PATH}
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+ NO_DEFAULT_PATH)
+get_filename_component(ARROW_FLIGHT_LIBS ${ARROW_FLIGHT_LIB_PATH} DIRECTORY)
+
+if(MSVC)
+ find_library(ARROW_FLIGHT_SHARED_LIBRARIES
+ NAMES arrow_flight
+ PATHS ${ARROW_HOME}
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+ NO_DEFAULT_PATH)
+ get_filename_component(ARROW_FLIGHT_SHARED_LIBS ${ARROW_FLIGHT_SHARED_LIBRARIES} DIRECTORY)
+endif()
+
+if(ARROW_FLIGHT_INCLUDE_DIR AND ARROW_FLIGHT_LIBS)
+ set(ARROW_FLIGHT_FOUND TRUE)
+ set(ARROW_FLIGHT_LIB_NAME arrow_flight)
+ if(MSVC)
+ set(
+ ARROW_FLIGHT_STATIC_LIB
+ ${ARROW_FLIGHT_LIBS}/${ARROW_FLIGHT_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ set(ARROW_FLIGHT_SHARED_LIB
+ ${ARROW_FLIGHT_SHARED_LIBS}/${ARROW_FLIGHT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(ARROW_FLIGHT_SHARED_IMP_LIB ${ARROW_FLIGHT_LIBS}/${ARROW_FLIGHT_LIB_NAME}.lib)
+ else()
+ set(ARROW_FLIGHT_STATIC_LIB ${ARROW_LIBS}/lib${ARROW_FLIGHT_LIB_NAME}.a)
+ set(ARROW_FLIGHT_SHARED_LIB
+ ${ARROW_LIBS}/lib${ARROW_FLIGHT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ endif()
+endif()
+
+if(ARROW_FLIGHT_FOUND)
+ if(NOT ArrowFlight_FIND_QUIETLY)
+ message(STATUS "Found the Arrow Flight library: ${ARROW_FLIGHT_LIB_PATH}")
+ endif()
+else()
+ if(NOT ArrowFlight_FIND_QUIETLY)
+ set(ARROW_FLIGHT_ERR_MSG "Could not find the Arrow Flight library. Looked for headers")
+ set(ARROW_FLIGHT_ERR_MSG
+ "${ARROW_FLIGHT_ERR_MSG} in ${ARROW_SEARCH_HEADER_PATHS}, and for libs")
+ set(ARROW_FLIGHT_ERR_MSG "${ARROW_FLIGHT_ERR_MSG} in ${ARROW_SEARCH_LIB_PATH}")
+ if(ArrowFlight_FIND_REQUIRED)
+ message(FATAL_ERROR "${ARROW_FLIGHT_ERR_MSG}")
+ else(ArrowFlight_FIND_REQUIRED)
+ message(STATUS "${ARROW_FLIGHT_ERR_MSG}")
+ endif(ArrowFlight_FIND_REQUIRED)
+ endif()
+ set(ARROW_FLIGHT_FOUND FALSE)
+endif()
+
+if(MSVC)
+ mark_as_advanced(ARROW_FLIGHT_INCLUDE_DIR ARROW_FLIGHT_STATIC_LIB ARROW_FLIGHT_SHARED_LIB
+ ARROW_FLIGHT_SHARED_IMP_LIB)
+else()
+ mark_as_advanced(ARROW_FLIGHT_INCLUDE_DIR ARROW_FLIGHT_STATIC_LIB ARROW_FLIGHT_SHARED_LIB)
+endif()
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 6d8d16f..9b9c8bb 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -362,15 +362,9 @@ endif()
if(MSVC)
add_thirdparty_lib(arrow SHARED_LIB ${ARROW_SHARED_IMP_LIB})
add_thirdparty_lib(arrow_python SHARED_LIB ${ARROW_PYTHON_SHARED_IMP_LIB})
- if(PYARROW_BUILD_FLIGHT)
- add_thirdparty_lib(arrow_flight SHARED_LIB ${ARROW_FLIGHT_SHARED_IMP_LIB})
- endif()
else()
add_thirdparty_lib(arrow SHARED_LIB ${ARROW_SHARED_LIB})
add_thirdparty_lib(arrow_python SHARED_LIB ${ARROW_PYTHON_SHARED_LIB})
- if(PYARROW_BUILD_FLIGHT)
- add_thirdparty_lib(arrow_flight SHARED_LIB ${ARROW_FLIGHT_SHARED_LIB})
- endif()
endif()
#
@@ -492,16 +486,29 @@ endif()
# Flight
if(PYARROW_BUILD_FLIGHT)
- if(PYARROW_BUNDLE_ARROW_CPP)
- # TODO: need to implement FindArrowFlight.cmake first
- message(FATAL_ERROR "Not yet implemented: bundling arrow-flight in pyarrow")
+ # Arrow CUDA
+ find_package(ArrowFlight)
+ if(NOT ARROW_FLIGHT_FOUND)
+ message(FATAL_ERROR "Unable to locate Arrow Flight libraries")
+ else()
+ if(PYARROW_BUNDLE_ARROW_CPP)
+ bundle_arrow_lib(ARROW_FLIGHT_SHARED_LIB
+ ABI_VERSION
+ ${ARROW_ABI_VERSION}
+ SO_VERSION
+ ${ARROW_SO_VERSION})
+ if(MSVC)
+ bundle_arrow_implib(ARROW_FLIGHT_SHARED_IMP_LIB)
+ endif()
+ endif()
+ if(MSVC)
+ add_thirdparty_lib(arrow_flight SHARED_LIB ${ARROW_FLIGHT_SHARED_IMP_LIB})
+ else()
+ add_thirdparty_lib(arrow_flight SHARED_LIB ${ARROW_FLIGHT_SHARED_LIB})
+ endif()
+ set(LINK_LIBS ${LINK_LIBS} arrow_flight_shared)
+ set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
endif()
- # We do NOT want to link gRPC or any other Flight dependency
- # here. Linking more than one copy leads to odd runtime errors due
- # to multiple copies of static global state. Thus we also need to
- # link Flight as a shared object.
- set(LINK_LIBS ${LINK_LIBS} arrow_flight_shared)
- set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
endif()
# Gandiva
diff --git a/python/setup.py b/python/setup.py
index 88fcba2..65b9537 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -361,7 +361,7 @@ class build_ext(_build_ext):
move_shared_libs(build_prefix, build_lib, "arrow")
move_shared_libs(build_prefix, build_lib, "arrow_python")
if self.with_cuda:
- move_shared_libs(build_prefix, build_lib, "arrow_gpu")
+ move_shared_libs(build_prefix, build_lib, "arrow_cuda")
if self.with_flight:
move_shared_libs(build_prefix, build_lib, "arrow_flight")
if self.with_plasma: