integrate numbuf into tree and remove ftruncate to prepare windows port

b-xiang · Jun 18, 2016 · 5158130 · 5158130
1 parent 68d752c
commit 5158130
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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})

diff --git a/thirdparty/download_thirdparty.sh b/thirdparty/download_thirdparty.sh
@@ -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

diff --git a/thirdparty/numbuf b/thirdparty/numbuf