fix travix ci

This commit is contained in:
Philipp Moritz committed 2017-07-19 10:06:33 -07:00
1 parent 348f9bf645
commit 1ff88e71c2
5 files changed
+18 -12

No files matched your search

+1 -4
View File
@@ -80,11 +80,8 @@ python_version_tests() {
python setup.py install
popd
# Build and install plasma
# Run Plasma tests
pushd $TRAVIS_BUILD_DIR/cpp/src/plasma
python setup.py install
# Run Plasma tests
python test/test.py
popd
}
+1
View File
@@ -71,6 +71,7 @@ function build_arrow_libraries() {
pushd $CPP_BUILD_DIR
cmake -DARROW_BUILD_TESTS=off \
-DARROW_PLASMA=on \
-DARROW_PYTHON=on \
-DCMAKE_INSTALL_PREFIX=$2 \
$CPP_DIR
+3
View File
@@ -107,6 +107,9 @@ install(FILES
protocol.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/plasma")
# Plasma store
install(TARGETS plasma_store DESTINATION ${CMAKE_INSTALL_BINDIR})
# pkg-config support
configure_file(plasma.pc.in
"${CMAKE_CURRENT_BINARY_DIR}/plasma.pc"
+11 -6
View File
@@ -124,10 +124,11 @@ def start_plasma_store(plasma_store_memory=DEFAULT_PLASMA_STORE_MEMORY,
"""
if use_valgrind and use_profiler:
raise Exception("Cannot use valgrind and profiler at the same time.")
module_dir = site.getsitepackages()
[plasma_dir] = glob.glob(os.path.join(module_dir[0], "plasma*"))
plasma_store_executable = os.path.join(os.path.abspath(plasma_dir),
"plasma/plasma_store")
prefix = os.environ.get("ARROW_HOME")
if prefix:
plasma_store_executable = os.path.join(prefix, "bin", "plasma_store")
else:
plasma_store_executable = "plasma_store"
plasma_store_name = "/tmp/plasma_store{}".format(random_name())
command = [plasma_store_executable,
"-s", plasma_store_name,
@@ -298,7 +299,11 @@ class TestPlasmaClient(unittest.TestCase):
# Write the DataFrame.
record_batch = pa.RecordBatch.from_pandas(df)
data_size = pa.get_record_batch_size(record_batch)
# Determine the size.
s = pa.MockOutputStream()
stream_writer = pa.RecordBatchStreamWriter(s, record_batch.schema)
stream_writer.write_batch(record_batch)
data_size = s.size()
object_id = plasma.ObjectID(np.random.bytes(20))
buf = self.plasma_client.create(object_id, data_size)
@@ -311,7 +316,7 @@ class TestPlasmaClient(unittest.TestCase):
# Read the DataFrame.
[data] = self.plasma_client.get([object_id])
reader = pa.RecordBatchStreamReader(pa.BufferReader(data))
result = reader.read_next_batch().to_pandas()
result = reader.get_next_batch().to_pandas()
pd.util.testing.assert_frame_equal(df, result)
+2 -2
View File
@@ -26,7 +26,7 @@
include(FindPkgConfig)
if ("$ENV{PLASMA_HOME}" STREQUAL "")
if ("$ENV{ARROW_HOME}" STREQUAL "")
pkg_check_modules(PLASMA plasma)
if (PLASMA_FOUND)
pkg_get_variable(PLASMA_ABI_VERSION plasma abi_version)
@@ -38,7 +38,7 @@ if ("$ENV{PLASMA_HOME}" STREQUAL "")
set(PLASMA_SEARCH_LIB_PATH ${PLASMA_LIBRARY_DIRS})
endif()
else()
set(PLASMA_HOME "$ENV{PLASMA_HOME}")
set(PLASMA_HOME "$ENV{ARROW_HOME}")
set(PLASMA_SEARCH_HEADER_PATHS
${PLASMA_HOME}/include