GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

Sign up for GitHub

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

Merged
kou merged 2 commits into from
Jan 3, 2023
Merged

GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib #15143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b11120b
GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib
kou Dec 31, 2022
340a9e9
Remove _shared
kou Jan 1, 2023
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
4 changes: 4 additions & 0 deletions cpp/cmake_modules/FindNumPy.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
"${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)
5 changes: 5 additions & 0 deletions cpp/cmake_modules/FindPythonLibsNew.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
"Found PythonLibs: ${PYTHON_LIBRARY}"
"${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down
188 changes: 72 additions & 116 deletions python/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
# In the event that we are bundling the shared libraries (e.g. in a
# manylinux1 wheel), we need to set the RPATH of the extensions to the
# root of the pyarrow/ package so that libarrow is able to be
# loaded properly
if(APPLE)
set(CMAKE_INSTALL_NAME_DIR "@rpath")
set(CMAKE_INSTALL_RPATH "@loader_path/")
else()
set(CMAKE_INSTALL_RPATH "\$ORIGIN")
endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
PROPERTIES SKIP_PRECOMPILE_HEADERS ON
SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
endif()
find_package(ArrowDataset REQUIRED)
list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
ArrowDataset::arrow_dataset_shared)
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
ArrowDataset::arrow_dataset_static)
if(ARROW_BUILD_SHARED)
list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
else()
list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
if(PARQUET_REQUIRE_ENCRYPTION)
list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
if(ARROW_BUILD_SHARED)
list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
else()
list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
endif()
else()
message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
SOURCES
${PYARROW_CPP_SRCS}
PRECOMPILED_HEADERS
"$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
INSTALL_ARCHIVE_DIR
"."
INSTALL_LIBRARY_DIR
"."
INSTALL_RUNTIME_DIR
"."
OUTPUTS
PYARROW_CPP_LIBRARIES
SHARED_LINK_LIBS
${PYARROW_CPP_SHARED_LINK_LIBS}
SHARED_PRIVATE_LINK_LIBS
${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
SHARED_INSTALL_INTERFACE_LIBS
${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
STATIC_LINK_LIBS
${PYARROW_CPP_STATIC_LINK_LIBS}
STATIC_INSTALL_INTERFACE_LIBS
${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
EXTRA_INCLUDES
${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
if(ARROW_BUILD_SHARED)
list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
else()
list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
target_precompile_headers(arrow_python PUBLIC
"$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
ARCHIVE DESTINATION .
LIBRARY DESTINATION .
RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
endif()
find_package(ArrowFlight REQUIRED)

add_arrow_lib(arrow_python_flight
SOURCES
${PYARROW_CPP_FLIGHT_SRCS}
INSTALL_ARCHIVE_DIR
"."
INSTALL_LIBRARY_DIR
"."
INSTALL_RUNTIME_DIR
"."
OUTPUTS
PYARROW_CPP_FLIGHT_LIBRARIES
SHARED_LINK_LIBS
arrow_python_shared
ArrowFlight::arrow_flight_shared
SHARED_INSTALL_INTERFACE_LIBS
arrow_python_shared
ArrowFlight::arrow_flight_shared
STATIC_LINK_LIBS
arrow_python_static
ArrowFlight::arrow_flight_static
STATIC_INSTALL_INTERFACE_LIBS
arrow_python_static
ArrowFlight::arrow_flight_static)

foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
endforeach()

if(ARROW_BUILD_STATIC AND MSVC)
target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
endif()
add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
target_link_libraries(arrow_python_flight PUBLIC arrow_python
ArrowFlight::arrow_flight_shared)
target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
install(TARGETS arrow_python_flight
ARCHIVE DESTINATION .
LIBRARY DESTINATION .
RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
lib
_compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
_pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
endif()
endif()

set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
set(FLIGHT_LINK_LIBS arrow_python_flight)
set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
${module_output_directory})
endif()

# In the event that we are bundling the shared libraries (e.g. in a
# manylinux1 wheel), we need to set the RPATH of the extensions to the
# root of the pyarrow/ package so that libarrow is able to be
# loaded properly
if(APPLE)
set(module_install_rpath "@loader_path/")
else()
set(module_install_rpath "\$ORIGIN")
endif()

# XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
# modules in interior directories. Since all of our C extensions and
# bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
# math(EXPR i "${i} - 1" )
# endwhile(${i} GREATER 0)

set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

if(PYARROW_GENERATE_COVERAGE)
set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
"CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib#15143

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.

 Sign up for GitHub

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

 Merged

kou
merged 2 commits into

from

Jan 3, 2023
 Merged


GH-15136: [Python][macOS] Use @rpath for libarrow_python.dylib
#15143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b11120b

GH-15136: [Python][macOS] Use `@rpath` for libarrow_python.dylib


kou Dec 31, 2022
340a9e9

Remove _shared


kou Jan 1, 2023

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


4 changes: 4 additions & 0 deletions
cpp/cmake_modules/FindNumPy.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,7 @@ find_package_message(NUMPY
 "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")

set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)

5 changes: 5 additions & 0 deletions
cpp/cmake_modules/FindPythonLibsNew.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ find_package_message(PYTHON
 "Found PythonLibs: ${PYTHON_LIBRARY}"
 "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
set_target_properties(Python3::Module PROPERTIES
 IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
 IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")

# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
Expand Down

188 changes: 72 additions & 116 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,16 +42,32 @@ endif()

include(CMakeParseArguments)

# MACOSX_RPATH is enabled by default.
# https://www.cmake.org/cmake/help/latest/policy/CMP0042.html
cmake_policy(SET CMP0042 NEW)

# Only interpret if() arguments as variables or keywords when unquoted.
# https://www.cmake.org/cmake/help/latest/policy/CMP0054.html
cmake_policy(SET CMP0054 NEW)

# RPATH settings on macOS do not affect install_name.
# https://cmake.org/cmake/help/latest/policy/CMP0068.html
if(POLICY CMP0068)
 cmake_policy(SET CMP0068 NEW)
endif()

# find_package() uses <PackageName>_ROOT variables.
# https://cmake.org/cmake/help/latest/policy/CMP0074.html
if(POLICY CMP0074)
 cmake_policy(SET CMP0074 NEW)
endif()

# RPATH entries are properly escaped in the intermediary CMake install script.
# https://cmake.org/cmake/help/latest/policy/CMP0095.html
if(POLICY CMP0095)
 cmake_policy(SET CMP0095 NEW)
endif()

# Use the first Python installation on PATH, not the newest one
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
Expand All@@ -78,6 +94,20 @@ if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(CMAKE_INSTALL_NAME_DIR "@rpath")
 set(CMAKE_INSTALL_RPATH "@loader_path/")
 else()
 set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
endif()

# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
Expand DownExpand Up@@ -232,8 +262,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}")
find_package(Python3Alt REQUIRED)
include(UseCython)

include_directories(SYSTEM ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} src)

# PyArrow C++
include(GNUInstallDirs)

Expand DownExpand Up@@ -266,11 +294,7 @@ set_source_files_properties(${PYARROW_CPP_SOURCE_DIR}/init.cc
 PROPERTIES SKIP_PRECOMPILE_HEADERS ON
 SKIP_UNITY_BUILD_INCLUSION ON)

set(PYARROW_CPP_SHARED_LINK_LIBS)
set(PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS)
set(PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_STATIC_LINK_LIBS)
set(PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
set(PYARROW_CPP_LINK_LIBS "")

#
# Arrow vs PyArrow C++ options
Expand All@@ -282,12 +306,11 @@ if(PYARROW_BUILD_DATASET)
 message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
 endif()
 find_package(ArrowDataset REQUIRED)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ArrowDataset::arrow_dataset_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS
 ArrowDataset::arrow_dataset_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS ArrowDataset::arrow_dataset_static)
 endif()
endif()

if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
Expand All@@ -300,10 +323,11 @@ endif()
if(PYARROW_BUILD_PARQUET_ENCRYPTION)
 if(PARQUET_REQUIRE_ENCRYPTION)
 list(APPEND PYARROW_CPP_SRCS ${PYARROW_CPP_SOURCE_DIR}/parquet_encryption.cc)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Parquet::parquet_shared)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Parquet::parquet_static)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Parquet::parquet_static)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Parquet::parquet_static)
 endif()
 else()
 message(FATAL_ERROR "You must build Arrow C++ with PARQUET_REQUIRE_ENCRYPTION=ON")
 endif()
Expand All@@ -330,57 +354,26 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL
 PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()

if(NOT PYARROW_CPP_SHARED_LINK_LIBS)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS Arrow::arrow_shared)
endif()
if(NOT PYARROW_CPP_STATIC_LINK_LIBS)
 list(APPEND PYARROW_CPP_STATIC_LINK_LIBS Arrow::arrow_static)
endif()
list(APPEND PYARROW_CPP_STATIC_LINK_LIBS ${PYTHON_OTHER_LIBS})
if(NOT PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS)
 list(APPEND PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS Arrow::arrow_static)
endif()

if(WIN32)
 list(APPEND PYARROW_CPP_SHARED_LINK_LIBS ${PYTHON_LIBRARIES} ${PYTHON_OTHER_LIBS})
endif()

add_arrow_lib(arrow_python
 SOURCES
 ${PYARROW_CPP_SRCS}
 PRECOMPILED_HEADERS
 "$<$<COMPILE_LANGUAGE:CXX>:${PYARROW_CPP_SOURCE_DIR}/pch.h>"
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_LIBRARIES
 SHARED_LINK_LIBS
 ${PYARROW_CPP_SHARED_LINK_LIBS}
 SHARED_PRIVATE_LINK_LIBS
 ${PYARROW_CPP_SHARED_PRIVATE_LINK_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_LINK_LIBS
 ${PYARROW_CPP_STATIC_LINK_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${PYARROW_CPP_STATIC_INSTALL_INTERFACE_LIBS}
 EXTRA_INCLUDES
 ${PYARROW_CPP_ROOT_DIR})

foreach(LIB_TARGET ${PYARROW_CPP_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYTHON_EXPORTING)
endforeach()
if(NOT PYARROW_CPP_LINK_LIBS)
 if(ARROW_BUILD_SHARED)
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_shared)
 else()
 list(APPEND PYARROW_CPP_LINK_LIBS Arrow::arrow_static)
 endif()
endif()

if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_static PUBLIC ARROW_PYTHON_STATIC)
add_library(arrow_python SHARED ${PYARROW_CPP_SRCS})
target_include_directories(arrow_python PUBLIC ${PYARROW_CPP_ROOT_DIR})
if(NOT CMAKE_VERSION VERSION_LESS 3.16)
 target_precompile_headers(arrow_python PUBLIC
 "$<$<COMPILE_LANGUAGE:CXX>:arrow/python/pch.h>")
endif()
target_link_libraries(arrow_python PUBLIC ${PYARROW_CPP_LINK_LIBS} Python3::NumPy)
target_compile_definitions(arrow_python PRIVATE ARROW_PYTHON_EXPORTING)
install(TARGETS arrow_python
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)

set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
if(PYARROW_BUILD_FLIGHT)
Expand All@@ -397,37 +390,14 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 find_package(ArrowFlight REQUIRED)

 add_arrow_lib(arrow_python_flight
 SOURCES
 ${PYARROW_CPP_FLIGHT_SRCS}
 INSTALL_ARCHIVE_DIR
 "."
 INSTALL_LIBRARY_DIR
 "."
 INSTALL_RUNTIME_DIR
 "."
 OUTPUTS
 PYARROW_CPP_FLIGHT_LIBRARIES
 SHARED_LINK_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 SHARED_INSTALL_INTERFACE_LIBS
 arrow_python_shared
 ArrowFlight::arrow_flight_shared
 STATIC_LINK_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static
 STATIC_INSTALL_INTERFACE_LIBS
 arrow_python_static
 ArrowFlight::arrow_flight_static)

 foreach(LIB_TARGET ${PYARROW_CPP_FLIGHT_LIBRARIES})
 target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_PYFLIGHT_EXPORTING)
 endforeach()

 if(ARROW_BUILD_STATIC AND MSVC)
 target_compile_definitions(arrow_python_flight_static PUBLIC ARROW_PYFLIGHT_STATIC)
 endif()
 add_library(arrow_python_flight SHARED ${PYARROW_CPP_FLIGHT_SRCS})
 target_link_libraries(arrow_python_flight PUBLIC arrow_python
 ArrowFlight::arrow_flight_shared)
 target_compile_definitions(arrow_python_flight PRIVATE ARROW_PYFLIGHT_EXPORTING)
 install(TARGETS arrow_python_flight
 ARCHIVE DESTINATION .
 LIBRARY DESTINATION .
 RUNTIME DESTINATION .)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand DownExpand Up@@ -546,13 +516,9 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()

#
# Subdirectories
# Cython modules
#

if(UNIX)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

set(CYTHON_EXTENSIONS
 lib
 _compute
Expand All@@ -565,7 +531,7 @@ set(CYTHON_EXTENSIONS
 _pyarrow_cpp_tests)
set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)

set(LINK_LIBS arrow_python_shared)
set(LINK_LIBS arrow_python)

if(PYARROW_BUILD_GCS)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _gcsfs)
Expand DownExpand Up@@ -684,8 +650,10 @@ if(PYARROW_BUILD_FLIGHT)
 endif()
 endif()

 set(FLIGHT_LINK_LIBS arrow_python_flight_shared)
 set(FLIGHT_LINK_LIBS arrow_python_flight)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
else()
 set(FLIGHT_LINK_LIBS "")
endif()

# Substrait
Expand DownExpand Up@@ -756,16 +724,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 ${module_output_directory})
 endif()

 # In the event that we are bundling the shared libraries (e.g. in a
 # manylinux1 wheel), we need to set the RPATH of the extensions to the
 # root of the pyarrow/ package so that libarrow is able to be
 # loaded properly
 if(APPLE)
 set(module_install_rpath "@loader_path/")
 else()
 set(module_install_rpath "\$ORIGIN")
 endif()

 # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
 # modules in interior directories. Since all of our C extensions and
 # bundled libraries are in the same place, we can skip this part
Expand All@@ -776,8 +734,6 @@ foreach(module ${CYTHON_EXTENSIONS})
 # math(EXPR i "${i} - 1" )
 # endwhile(${i} GREATER 0)

 set_target_properties(${module_name} PROPERTIES INSTALL_RPATH ${module_install_rpath})

 if(PYARROW_GENERATE_COVERAGE)
 set_target_properties(${module_name} PROPERTIES COMPILE_DEFINITIONS
 "CYTHON_TRACE=1;CYTHON_TRACE_NOGIL=1")
Expand Down