From d64f69f215916b010bc910a2dfa2ccd34b150860 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Sat, 19 Nov 2016 17:38:36 -0800 Subject: [PATCH] switch from submodule to cloning arrow, travis fixes & Robert's comments --- .travis.yml | 6 + doc/install-on-macosx.md | 4 +- doc/install-on-ubuntu.md | 4 +- install-dependencies.sh | 1 - numbuf/.gitignore | 32 --- numbuf/.gitmodules | 3 - numbuf/.travis.yml | 25 --- numbuf/LICENSE | 201 ------------------ numbuf/README.md | 2 - numbuf/install-dependencies.sh | 36 ---- numbuf/python/src/pynumbuf/adapters/numpy.cc | 5 +- numbuf/python/src/pynumbuf/adapters/python.cc | 10 +- numbuf/python/test/runtest.py | 2 +- numbuf/setup.py | 7 +- numbuf/setup.sh | 6 +- numbuf/thirdparty/arrow | 1 - numbuf/thirdparty/download_thirdparty.sh | 4 +- 17 files changed, 25 insertions(+), 324 deletions(-) delete mode 100644 numbuf/.gitignore delete mode 100644 numbuf/.gitmodules delete mode 100644 numbuf/.travis.yml delete mode 100644 numbuf/LICENSE delete mode 100644 numbuf/README.md delete mode 100755 numbuf/install-dependencies.sh delete mode 160000 numbuf/thirdparty/arrow diff --git a/.travis.yml b/.travis.yml index d44a93d84..7e8293e8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,10 @@ matrix: install: - ./install-dependencies.sh - ./build.sh + + - cd numbuf + - sudo python setup.py install + - cd .. - cd src/common/lib/python - sudo python setup.py install @@ -62,6 +66,8 @@ install: - cd ../.. script: + - python numbuf/python/test/runtest.py + - python src/common/test/test.py - python src/plasma/test/test.py - python src/photon/test/test.py diff --git a/doc/install-on-macosx.md b/doc/install-on-macosx.md index bc208c9f0..02b3c9b74 100644 --- a/doc/install-on-macosx.md +++ b/doc/install-on-macosx.md @@ -1,6 +1,6 @@ # Installation on Mac OS X -Ray should work with Python 2 and Python 3. We have tested Ray on OS X 10.11. +Ray should work with Python 2. We have tested Ray on OS X 10.11. ## Dependencies @@ -14,7 +14,7 @@ sudo easy_install pip # If you're using Anaconda, then this is unnecessary. pip install numpy funcsigs colorama psutil redis --ignore-installed six pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 # We use the latest version of cloudpickle because it can serialize named tuples. -pip install --upgrade --verbose git+git://github.com/ray-project/numbuf.git@488f881d708bc54e86ed375ee97aa94540808fa1 +pip install --upgrade --verbose "git+git://github.com/ray-project/ray.git#egg=ray&subdirectory=numbuf" ``` # Install Ray diff --git a/doc/install-on-ubuntu.md b/doc/install-on-ubuntu.md index fc4638dcc..9d8c50a77 100644 --- a/doc/install-on-ubuntu.md +++ b/doc/install-on-ubuntu.md @@ -1,6 +1,6 @@ # Installation on Ubuntu -Ray should work with Python 2 and Python 3. We have tested Ray on Ubuntu 14.04 +Ray should work with Python 2. We have tested Ray on Ubuntu 14.04 and Ubuntu 16.04 ## Dependencies @@ -14,7 +14,7 @@ sudo apt-get install -y cmake build-essential autoconf curl libtool python-dev p pip install numpy funcsigs colorama psutil redis pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 # We use the latest version of cloudpickle because it can serialize named tuples. -pip install --upgrade --verbose git+git://github.com/ray-project/numbuf.git@488f881d708bc54e86ed375ee97aa94540808fa1 +pip install --upgrade --verbose "git+git://github.com/ray-project/ray.git#egg=ray&subdirectory=numbuf" ``` # Install Ray diff --git a/install-dependencies.sh b/install-dependencies.sh index d6104f50b..546989d15 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -37,4 +37,3 @@ elif [[ $platform == "macosx" ]]; then fi sudo pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 # We use the latest version of cloudpickle because it can serialize named tuples. -sudo pip install --upgrade --verbose git+git://github.com/ray-project/numbuf.git@488f881d708bc54e86ed375ee97aa94540808fa1 diff --git a/numbuf/.gitignore b/numbuf/.gitignore deleted file mode 100644 index 2a83b5467..000000000 --- a/numbuf/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -# Build directory -build diff --git a/numbuf/.gitmodules b/numbuf/.gitmodules deleted file mode 100644 index 29d35a973..000000000 --- a/numbuf/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "thirdparty/arrow"] - path = thirdparty/arrow - url = https://github.com/pcmoritz/arrow.git diff --git a/numbuf/.travis.yml b/numbuf/.travis.yml deleted file mode 100644 index fe784d053..000000000 --- a/numbuf/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -sudo: required - -language: generic - -matrix: - include: - - os: linux - dist: trusty - python: "2.7" - - os: linux - dist: trusty - python: "3.5" - - os: osx - osx_image: xcode7 - python: "2.7" - - os: osx - osx_image: xcode7 - python: "3.5" - -install: - - ./install-dependencies.sh - - python setup.py install --user - -script: - - python python/test/runtest.py diff --git a/numbuf/LICENSE b/numbuf/LICENSE deleted file mode 100644 index 8dada3eda..000000000 --- a/numbuf/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/numbuf/README.md b/numbuf/README.md deleted file mode 100644 index b94616b43..000000000 --- a/numbuf/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# numbuf -Serializing primitive Python types in Arrow diff --git a/numbuf/install-dependencies.sh b/numbuf/install-dependencies.sh deleted file mode 100755 index 88973f6de..000000000 --- a/numbuf/install-dependencies.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) - -platform="unknown" -unamestr="$(uname)" -if [[ "$unamestr" == "Linux" ]]; then - echo "Platform is linux." - platform="linux" -elif [[ "$unamestr" == "Darwin" ]]; then - echo "Platform is macosx." - platform="macosx" -else - echo "Unrecognized platform." - exit 1 -fi - -if [[ $platform == "linux" ]]; then - # These commands must be kept in sync with the installation instructions. - sudo apt-get update - sudo apt-get install -y cmake build-essential autoconf libtool python-dev python-numpy libboost-all-dev -elif [[ $platform == "macosx" ]]; then - # check that brew is installed - which -s brew - if [[ $? != 0 ]]; then - echo "Could not find brew, please install brew (see http://brew.sh/)." - exit 1 - else - echo "Updating brew." - brew update - fi - # These commands must be kept in sync with the installation instructions. - brew install cmake automake autoconf libtool boost - sudo easy_install pip - sudo pip install numpy --ignore-installed six -fi diff --git a/numbuf/python/src/pynumbuf/adapters/numpy.cc b/numbuf/python/src/pynumbuf/adapters/numpy.cc index 4964f61f2..238eb0092 100644 --- a/numbuf/python/src/pynumbuf/adapters/numpy.cc +++ b/numbuf/python/src/pynumbuf/adapters/numpy.cc @@ -116,10 +116,7 @@ Status SerializeArray( // must be decremented. This is done in SerializeDict in python.cc. PyObject* result = PyObject_CallObject(numbuf_serialize_callback, arglist); Py_XDECREF(arglist); - if (!result) { - return Status::NotImplemented("python error"); // TODO(pcm): - // https://github.com/ray-project/numbuf/issues/10 - } + if (!result) { return Status::NotImplemented("python error"); } builder.AppendDict(PyDict_Size(result)); subdicts.push_back(result); } diff --git a/numbuf/python/src/pynumbuf/adapters/python.cc b/numbuf/python/src/pynumbuf/adapters/python.cc index eada6e958..8bebe2810 100644 --- a/numbuf/python/src/pynumbuf/adapters/python.cc +++ b/numbuf/python/src/pynumbuf/adapters/python.cc @@ -128,10 +128,7 @@ Status append(PyObject* elem, SequenceBuilder& builder, std::vector& // must be decremented. This is done in SerializeDict in this file. PyObject* result = PyObject_CallObject(numbuf_serialize_callback, arglist); Py_XDECREF(arglist); - if (!result) { - return Status::NotImplemented("python error"); // TODO(pcm): - // https://github.com/ray-project/numbuf/issues/10 - } + if (!result) { return Status::NotImplemented("python error"); } builder.AppendDict(PyDict_Size(result)); subdicts.push_back(result); } @@ -285,10 +282,7 @@ Status DeserializeDict(std::shared_ptr array, int32_t start_idx, int32_t Py_XDECREF(arglist); Py_XDECREF(result); result = callback_result; - if (!callback_result) { - return Status::NotImplemented("python error"); // TODO(pcm): - // https://github.com/ray-project/numbuf/issues/10 - } + if (!callback_result) { return Status::NotImplemented("python error"); } } *out = result; return Status::OK(); diff --git a/numbuf/python/test/runtest.py b/numbuf/python/test/runtest.py index 4c9b409f6..56a1f0996 100644 --- a/numbuf/python/test/runtest.py +++ b/numbuf/python/test/runtest.py @@ -38,7 +38,7 @@ class SerializationTests(unittest.TestCase): self.roundTripTest([{"hello": [1, 2, 3]}]) self.roundTripTest([{"hello": [1, [2, 3]]}]) self.roundTripTest([{"hello": (None, 2, [3, 4])}]) - self.roundTripTest([{"hello": (None, 2, [3, 4], np.ndarray([1.0, 2.0, 3.0]))}]) + self.roundTripTest([{"hello": (None, 2, [3, 4], np.array([1.0, 2.0, 3.0]))}]) def numpyTest(self, t): a = np.random.randint(0, 10, size=(100, 100)).astype(t) diff --git a/numbuf/setup.py b/numbuf/setup.py index 066ca4d0c..26b4f208a 100644 --- a/numbuf/setup.py +++ b/numbuf/setup.py @@ -1,5 +1,5 @@ import subprocess -from setuptools import setup, find_packages, Extension +from setuptools import setup, find_packages import setuptools.command.install as _install from sys import platform @@ -23,7 +23,10 @@ class install(_install.install): setup(name="numbuf", version="0.0.1", packages=find_packages(), - package_data={"numbuf": ["libnumbuf.so", "libarrow" + extension, "libarrow_io" + extension, "libarrow_ipc" + extension]}, + package_data={"numbuf": ["libnumbuf.so", + "libarrow" + extension, + "libarrow_io" + extension, + "libarrow_ipc" + extension]}, cmdclass={"install": install}, setup_requires=["numpy"], include_package_data=True, diff --git a/numbuf/setup.sh b/numbuf/setup.sh index 71482975e..02a5acd73 100755 --- a/numbuf/setup.sh +++ b/numbuf/setup.sh @@ -15,7 +15,7 @@ else exit 1 fi -pushd "$ROOT_DIR/thirdparty" - ./download_thirdparty.sh - ./build_thirdparty.sh +pushd "$ROOT_DIR" + ./thirdparty/download_thirdparty.sh + ./thirdparty/build_thirdparty.sh popd diff --git a/numbuf/thirdparty/arrow b/numbuf/thirdparty/arrow deleted file mode 160000 index 58bd7bedc..000000000 --- a/numbuf/thirdparty/arrow +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58bd7bedc63d66d5898297bab25b54dfb67665db diff --git a/numbuf/thirdparty/download_thirdparty.sh b/numbuf/thirdparty/download_thirdparty.sh index 044565252..c6a9ea19b 100755 --- a/numbuf/thirdparty/download_thirdparty.sh +++ b/numbuf/thirdparty/download_thirdparty.sh @@ -5,4 +5,6 @@ set -e TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) -git submodule update --init --recursive -- "$TP_DIR/arrow" +git clone https://github.com/pcmoritz/arrow.git "$TP_DIR/arrow" +cd "$TP_DIR/arrow" +git checkout 58bd7bedc63d66d5898297bab25b54dfb67665db