hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 10:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #123 from amplab/winfix

Browse source 
Integrate numbuf into tree and remove ftruncate to prepare windows port
This commit is contained in:
Robert Nishihara 2016-06-18 15:29:27 -07:00 • committed by GitHub
commit a461c7af8b
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "thirdparty/grpc"] [submodule "thirdparty/grpc"]
path = thirdparty/grpc path = thirdparty/grpc
url = https://github.com/grpc/grpc url = https://github.com/grpc/grpc
[submodule "thirdparty/numbuf"]
path = thirdparty/numbuf
url = https://github.com/amplab/numbuf.git

1
CMakeLists.txt
View file

@ -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/metadata.cc
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/cpp/src/numbuf/dict.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/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/numpy.cc
${CMAKE_SOURCE_DIR}/thirdparty/numbuf/python/src/pynumbuf/adapters/python.cc) ${CMAKE_SOURCE_DIR}/thirdparty/numbuf/python/src/pynumbuf/adapters/python.cc)
target_link_libraries(pynumbuf ${ARROW_LIB} ${PYTHON_LIBRARIES}) target_link_libraries(pynumbuf ${ARROW_LIB} ${PYTHON_LIBRARIES})

5
thirdparty/download_thirdparty.sh vendored
View file

@ -13,11 +13,6 @@ if [ ! -d arrow ]; then
cd .. cd ..
fi fi
if [ ! -d numbuf ]; then
echo "Fetching numbuf"
git clone https://github.com/amplab/numbuf.git
fi
git submodule update --init --recursive git submodule update --init --recursive
# this seems to be neeccessary for building on Mac OS X # this seems to be neeccessary for building on Mac OS X

1
thirdparty/numbuf vendored Submodule

@ -0,0 +1 @@
Subproject commit 6c5a58b560a72c5a2dfdd92901b825c219a9052d