ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

Closed
wesm wants to merge 1 commit into from
Closed

ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 26 additions & 18 deletions python/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
option(PYARROW_BUILD_PARQUET
"Build the PyArrow Parquet integration"
OFF)
option(PYARROW_BUILD_PLASMA
"Build the PyArrow Plasma integration"
OFF)
option(PYARROW_BUNDLE_ARROW_CPP
"Bundle the Arrow C++ libraries"
OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
bundle_arrow_lib(ARROW_SHARED_LIB)
bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
if (PLASMA_FOUND)
bundle_arrow_lib(PLASMA_SHARED_LIB)
endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
lib
)

if (PLASMA_FOUND)
set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
arrow_shared
arrow_python_shared
${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
_parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
find_package(Plasma)

if(NOT PLASMA_FOUND)
message(FATAL_ERROR "Unable to locate Plasma libraries")
endif()

include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
ADD_THIRDPARTY_LIB(libplasma
SHARED_LIB ${PLASMA_SHARED_LIB})

if (PYARROW_BUNDLE_ARROW_CPP)
bundle_arrow_lib(PLASMA_SHARED_LIB)
endif()
set(LINK_LIBS
${LINK_LIBS}
libplasma_shared)

set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()
2 changes: 2 additions & 0 deletions python/cmake_modules/FindParquet.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
PATH_SUFFIXES "lib")
get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
set(PARQUET_ABI_VERSION "1.0.0")
set(PARQUET_SO_VERSION "1")
else()
pkg_check_modules(PARQUET parquet)
if (PARQUET_FOUND)
Expand Down
16 changes: 12 additions & 4 deletions python/setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
if self.with_parquet:
cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

if self.with_plasma:
cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

if self.bundle_arrow_cpp:
cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
# ARROW-1090: work around CMake rough edges
if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
'pkgconfig')
os.environ['PKG_CONFIG_PATH'] = pkg_config
del os.environ['ARROW_HOME']


cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
.format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
shutil.move(pjoin(build_prefix, 'include'),
pjoin(build_lib, 'pyarrow'))
move_lib("arrow")
move_lib("arrow_python")
if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
if self.with_plasma:
build_py = self.get_finalized_command('build_py')
source = os.path.join(self.build_type, "plasma_store")
target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
target = os.path.join(build_lib,
build_py.get_package_dir('pyarrow'),
"plasma_store")
shutil.move(source, target)

os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
def has_ext_modules(foo):
return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
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
ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet#903

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

 Closed

wesm
wants to merge
1
commit into

from

 Closed


ARROW-1289: [Python] Add PYARROW_BUILD_PLASMA CMake option, follow semantics of --with-parquet
#903
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 26 additions & 18 deletions
python/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 option(PYARROW_BUILD_PARQUET
 "Build the PyArrow Parquet integration"
 OFF)
 option(PYARROW_BUILD_PLASMA
 "Build the PyArrow Plasma integration"
 OFF)
 option(PYARROW_BUNDLE_ARROW_CPP
 "Bundle the Arrow C++ libraries"
 OFF)
Expand DownExpand Up@@ -157,12 +160,6 @@ include_directories(SYSTEM
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})

## Plasma
find_package(Plasma)
if (PLASMA_FOUND)
 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
endif()

function(bundle_arrow_lib library_path)
 get_filename_component(LIBRARY_DIR ${${library_path}} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${${library_path}} NAME_WE)
Expand DownExpand Up@@ -195,9 +192,6 @@ if (PYARROW_BUNDLE_ARROW_CPP)
 file(COPY ${ARROW_INCLUDE_DIR}/arrow DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY}/include)
 bundle_arrow_lib(ARROW_SHARED_LIB)
 bundle_arrow_lib(ARROW_PYTHON_SHARED_LIB)
 if (PLASMA_FOUND)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
endif()

if (MSVC)
Expand All@@ -224,14 +218,9 @@ set(CYTHON_EXTENSIONS
 lib
)

if (PLASMA_FOUND)
 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
endif()

set(LINK_LIBS
 arrow_shared
 arrow_python_shared
 ${PLASMA_SHARED_LIB}
)

if (PYARROW_BUILD_PARQUET)
Expand DownExpand Up@@ -284,6 +273,29 @@ if (PYARROW_BUILD_PARQUET)
 _parquet)
endif()

## Plasma
if (PYARROW_BUILD_PLASMA)
 find_package(Plasma)

 if(NOT PLASMA_FOUND)
 message(FATAL_ERROR "Unable to locate Plasma libraries")
 endif()

 include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
 ADD_THIRDPARTY_LIB(libplasma
 SHARED_LIB ${PLASMA_SHARED_LIB})

 if (PYARROW_BUNDLE_ARROW_CPP)
 bundle_arrow_lib(PLASMA_SHARED_LIB)
 endif()
 set(LINK_LIBS
 ${LINK_LIBS}
 libplasma_shared)

 set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} plasma)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

############################################################
# Setup and build Cython modules
############################################################
Expand DownExpand Up@@ -330,7 +342,3 @@ foreach(module ${CYTHON_EXTENSIONS})

 target_link_libraries(${module_name} ${LINK_LIBS})
endforeach(module)

if (PLASMA_FOUND)
 file(COPY ${PLASMA_EXECUTABLE} DESTINATION ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()

2 changes: 2 additions & 0 deletions
python/cmake_modules/FindParquet.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,8 @@ if(PARQUET_HOME)
 PATHS ${PARQUET_HOME} NO_DEFAULT_PATH
 PATH_SUFFIXES "lib")
 get_filename_component(PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
 set(PARQUET_ABI_VERSION "1.0.0")
 set(PARQUET_SO_VERSION "1")
else()
 pkg_check_modules(PARQUET parquet)
 if (PARQUET_FOUND)
Expand Down

16 changes: 12 additions & 4 deletions
python/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,14 +143,18 @@ def _run_cmake(self):
 if self.with_parquet:
 cmake_options.append('-DPYARROW_BUILD_PARQUET=on')

 if self.with_plasma:
 cmake_options.append('-DPYARROW_BUILD_PLASMA=on')

 if self.bundle_arrow_cpp:
 cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
 # ARROW-1090: work around CMake rough edges
 if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
 os.environ['PKG_CONFIG_PATH'] = pjoin(os.environ['ARROW_HOME'], 'lib', 'pkgconfig')
 pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
 'pkgconfig')
 os.environ['PKG_CONFIG_PATH'] = pkg_config
 del os.environ['ARROW_HOME']


 cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
 .format(self.build_type.lower()))

Expand DownExpand Up@@ -243,7 +247,8 @@ def move_lib(lib_name):
 print(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 if os.path.exists(pjoin(build_lib, 'pyarrow', 'include')):
 shutil.rmtree(pjoin(build_lib, 'pyarrow', 'include'))
 shutil.move(pjoin(build_prefix, 'include'), pjoin(build_lib, 'pyarrow'))
 shutil.move(pjoin(build_prefix, 'include'),
 pjoin(build_lib, 'pyarrow'))
 move_lib("arrow")
 move_lib("arrow_python")
 if self.with_plasma:
Expand DownExpand Up@@ -280,7 +285,9 @@ def move_lib(lib_name):
 if self.with_plasma:
 build_py = self.get_finalized_command('build_py')
 source = os.path.join(self.build_type, "plasma_store")
 target = os.path.join(build_lib, build_py.get_package_dir('pyarrow'), "plasma_store")
 target = os.path.join(build_lib,
 build_py.get_package_dir('pyarrow'),
 "plasma_store")
 shutil.move(source, target)

 os.chdir(saved_cwd)
Expand DownExpand Up@@ -350,6 +357,7 @@ def get_outputs(self):
language-bindings for structure manipulation. It also provides IPC
and common algorithm implementations."""


class BinaryDistribution(Distribution):
 def has_ext_modules(foo):
 return True
Expand Down