mirror of
https://github.com/vale981/ray
synced 2025-03-06 10:31:39 -05:00
Merge pull request #123 from amplab/winfix
Integrate numbuf into tree and remove ftruncate to prepare windows port
This commit is contained in:
commit
a461c7af8b
4 changed files with 4 additions and 6 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +1,6 @@
|
|||
[submodule "thirdparty/grpc"]
|
||||
path = thirdparty/grpc
|
||||
url = https://github.com/grpc/grpc
|
||||
[submodule "thirdparty/numbuf"]
|
||||
path = thirdparty/numbuf
|
||||
url = https://github.com/amplab/numbuf.git
|
||||
|
|
|
@ -102,7 +102,6 @@ add_library(pynumbuf STATIC ${CMAKE_SOURCE_DIR}/thirdparty/numbuf/cpp/src/numbuf
|
|||
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/cpp/src/numbuf/metadata.cc
|
||||
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/cpp/src/numbuf/dict.cc
|
||||
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/python/src/pynumbuf/serialize.cc
|
||||
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/python/src/pynumbuf/numbuf.cc
|
||||
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/python/src/pynumbuf/adapters/numpy.cc
|
||||
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/python/src/pynumbuf/adapters/python.cc)
|
||||
target_link_libraries(pynumbuf ${ARROW_LIB} ${PYTHON_LIBRARIES})
|
||||
|
|
5
thirdparty/download_thirdparty.sh
vendored
5
thirdparty/download_thirdparty.sh
vendored
|
@ -13,11 +13,6 @@ if [ ! -d arrow ]; then
|
|||
cd ..
|
||||
fi
|
||||
|
||||
if [ ! -d numbuf ]; then
|
||||
echo "Fetching numbuf"
|
||||
git clone https://github.com/amplab/numbuf.git
|
||||
fi
|
||||
|
||||
git submodule update --init --recursive
|
||||
|
||||
# this seems to be neeccessary for building on Mac OS X
|
||||
|
|
1
thirdparty/numbuf
vendored
Submodule
1
thirdparty/numbuf
vendored
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 6c5a58b560a72c5a2dfdd92901b825c219a9052d
|
Loading…
Add table
Reference in a new issue