-
Notifications
You must be signed in to change notification settings - Fork 4k
ARROW-819: Public Cython and C++ API in the style of lxml, arrow::py::import_pyarrow method #680
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d4a8391
Reorganize Cython code in the style of lxml so make declaring a publi…
wesm ff1b5e5
Rename things a bit
wesm b39d19c
Fix test suite. Move _config into lib
wesm cff757d
Expose pyarrow C API in arrow/python/pyarrow.h
wesm 9e6ee24
Fix up optional extensions
wesm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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. | ||
|
|
||
| #include "arrow/python/pyarrow.h" | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include "arrow/array.h" | ||
| #include "arrow/table.h" | ||
| #include "arrow/tensor.h" | ||
| #include "arrow/type.h" | ||
|
|
||
| namespace { | ||
| #include "arrow/python/pyarrow_api.h" | ||
| } | ||
|
|
||
| namespace arrow { | ||
| namespace py { | ||
|
|
||
| int import_pyarrow() { | ||
| return ::import_pyarrow__lib(); | ||
| } | ||
|
|
||
| PyObject* wrap_buffer(const std::shared_ptr<Buffer>& buffer) { | ||
| return ::pyarrow_wrap_buffer(buffer); | ||
| } | ||
|
|
||
| PyObject* wrap_data_type(const std::shared_ptr<DataType>& type) { | ||
| return ::pyarrow_wrap_data_type(type); | ||
| } | ||
|
|
||
| PyObject* wrap_field(const std::shared_ptr<Field>& field) { | ||
| return ::pyarrow_wrap_field(field); | ||
| } | ||
|
|
||
| PyObject* wrap_schema(const std::shared_ptr<Schema>& schema) { | ||
| return ::pyarrow_wrap_schema(schema); | ||
| } | ||
|
|
||
| PyObject* wrap_array(const std::shared_ptr<Array>& array) { | ||
| return ::pyarrow_wrap_array(array); | ||
| } | ||
|
|
||
| PyObject* wrap_tensor(const std::shared_ptr<Tensor>& tensor) { | ||
| return ::pyarrow_wrap_tensor(tensor); | ||
| } | ||
|
|
||
| PyObject* wrap_column(const std::shared_ptr<Column>& column) { | ||
| return ::pyarrow_wrap_column(column); | ||
| } | ||
|
|
||
| PyObject* wrap_table(const std::shared_ptr<Table>& table) { | ||
| return ::pyarrow_wrap_table(table); | ||
| } | ||
|
|
||
| PyObject* wrap_record_batch(const std::shared_ptr<RecordBatch>& batch) { | ||
| return ::pyarrow_wrap_batch(batch); | ||
| } | ||
|
|
||
| } // namespace py | ||
| } // namespace arrow | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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. | ||
|
|
||
| #ifndef ARROW_PYTHON_PYARROW_H | ||
| #define ARROW_PYTHON_PYARROW_H | ||
|
|
||
| #include "arrow/python/platform.h" | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include "arrow/util/visibility.h" | ||
|
|
||
| namespace arrow { | ||
|
|
||
| class Array; | ||
| class Buffer; | ||
| class Column; | ||
| class DataType; | ||
| class Field; | ||
| class RecordBatch; | ||
| class Schema; | ||
| class Table; | ||
| class Tensor; | ||
|
|
||
| namespace py { | ||
|
|
||
| ARROW_EXPORT int import_pyarrow(); | ||
| ARROW_EXPORT PyObject* wrap_buffer(const std::shared_ptr<Buffer>& buffer); | ||
| ARROW_EXPORT PyObject* wrap_data_type(const std::shared_ptr<DataType>& type); | ||
| ARROW_EXPORT PyObject* wrap_field(const std::shared_ptr<Field>& field); | ||
| ARROW_EXPORT PyObject* wrap_schema(const std::shared_ptr<Schema>& schema); | ||
| ARROW_EXPORT PyObject* wrap_array(const std::shared_ptr<Array>& array); | ||
| ARROW_EXPORT PyObject* wrap_tensor(const std::shared_ptr<Tensor>& tensor); | ||
| ARROW_EXPORT PyObject* wrap_column(const std::shared_ptr<Column>& column); | ||
| ARROW_EXPORT PyObject* wrap_table(const std::shared_ptr<Table>& table); | ||
| ARROW_EXPORT PyObject* wrap_record_batch(const std::shared_ptr<RecordBatch>& batch); | ||
|
|
||
| } // namespace py | ||
| } // namespace arrow | ||
|
|
||
| #endif // ARROW_PYTHON_PYARROW_H |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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. | ||
|
|
||
| // DO NOT EDIT THIS FILE. Update from pyarrow/lib_api.h after pyarrow build | ||
|
|
||
| /* Generated by Cython 0.25.2 */ | ||
|
|
||
| #ifndef __PYX_HAVE_API__pyarrow__lib | ||
| #define __PYX_HAVE_API__pyarrow__lib | ||
| #include "Python.h" | ||
|
|
||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_buffer)(std::shared_ptr< arrow::Buffer> const &) = 0; | ||
| #define pyarrow_wrap_buffer __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_buffer | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_data_type)(std::shared_ptr< arrow::DataType> const &) = 0; | ||
| #define pyarrow_wrap_data_type __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_data_type | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_field)(std::shared_ptr< arrow::Field> const &) = 0; | ||
| #define pyarrow_wrap_field __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_field | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_schema)(std::shared_ptr< arrow::Schema> const &) = 0; | ||
| #define pyarrow_wrap_schema __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_schema | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_array)(std::shared_ptr< arrow::Array> const &) = 0; | ||
| #define pyarrow_wrap_array __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_array | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_tensor)(std::shared_ptr< arrow::Tensor> const &) = 0; | ||
| #define pyarrow_wrap_tensor __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_tensor | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_column)(std::shared_ptr< arrow::Column> const &) = 0; | ||
| #define pyarrow_wrap_column __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_column | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_table)(std::shared_ptr< arrow::Table> const &) = 0; | ||
| #define pyarrow_wrap_table __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_table | ||
| static PyObject *(*__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_batch)(std::shared_ptr< arrow::RecordBatch> const &) = 0; | ||
| #define pyarrow_wrap_batch __pyx_api_f_7pyarrow_3lib_pyarrow_wrap_batch | ||
| #if !defined(__Pyx_PyIdentifier_FromString) | ||
| #if PY_MAJOR_VERSION < 3 | ||
| #define __Pyx_PyIdentifier_FromString(s) PyString_FromString(s) | ||
| #else | ||
| #define __Pyx_PyIdentifier_FromString(s) PyUnicode_FromString(s) | ||
| #endif | ||
| #endif | ||
|
|
||
| #ifndef __PYX_HAVE_RT_ImportModule | ||
| #define __PYX_HAVE_RT_ImportModule | ||
| static PyObject *__Pyx_ImportModule(const char *name) { | ||
| PyObject *py_name = 0; | ||
| PyObject *py_module = 0; | ||
| py_name = __Pyx_PyIdentifier_FromString(name); | ||
| if (!py_name) | ||
| goto bad; | ||
| py_module = PyImport_Import(py_name); | ||
| Py_DECREF(py_name); | ||
| return py_module; | ||
| bad: | ||
| Py_XDECREF(py_name); | ||
| return 0; | ||
| } | ||
| #endif | ||
|
|
||
| #ifndef __PYX_HAVE_RT_ImportFunction | ||
| #define __PYX_HAVE_RT_ImportFunction | ||
| static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**f)(void), const char *sig) { | ||
| PyObject *d = 0; | ||
| PyObject *cobj = 0; | ||
| union { | ||
| void (*fp)(void); | ||
| void *p; | ||
| } tmp; | ||
| d = PyObject_GetAttrString(module, (char *)"__pyx_capi__"); | ||
| if (!d) | ||
| goto bad; | ||
| cobj = PyDict_GetItemString(d, funcname); | ||
| if (!cobj) { | ||
| PyErr_Format(PyExc_ImportError, | ||
| "%.200s does not export expected C function %.200s", | ||
| PyModule_GetName(module), funcname); | ||
| goto bad; | ||
| } | ||
| #if PY_VERSION_HEX >= 0x02070000 | ||
| if (!PyCapsule_IsValid(cobj, sig)) { | ||
| PyErr_Format(PyExc_TypeError, | ||
| "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)", | ||
| PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj)); | ||
| goto bad; | ||
| } | ||
| tmp.p = PyCapsule_GetPointer(cobj, sig); | ||
| #else | ||
| {const char *desc, *s1, *s2; | ||
| desc = (const char *)PyCObject_GetDesc(cobj); | ||
| if (!desc) | ||
| goto bad; | ||
| s1 = desc; s2 = sig; | ||
| while (*s1 != '\0' && *s1 == *s2) { s1++; s2++; } | ||
| if (*s1 != *s2) { | ||
| PyErr_Format(PyExc_TypeError, | ||
| "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)", | ||
| PyModule_GetName(module), funcname, sig, desc); | ||
| goto bad; | ||
| } | ||
| tmp.p = PyCObject_AsVoidPtr(cobj);} | ||
| #endif | ||
| *f = tmp.fp; | ||
| if (!(*f)) | ||
| goto bad; | ||
| Py_DECREF(d); | ||
| return 0; | ||
| bad: | ||
| Py_XDECREF(d); | ||
| return -1; | ||
| } | ||
| #endif | ||
|
|
||
|
|
||
| static int import_pyarrow__lib(void) { | ||
| PyObject *module = 0; | ||
| module = __Pyx_ImportModule("pyarrow.lib"); | ||
| if (!module) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_buffer", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_buffer, "PyObject *(std::shared_ptr< arrow::Buffer> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_data_type", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_data_type, "PyObject *(std::shared_ptr< arrow::DataType> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_field", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_field, "PyObject *(std::shared_ptr< arrow::Field> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_schema", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_schema, "PyObject *(std::shared_ptr< arrow::Schema> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_array", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_array, "PyObject *(std::shared_ptr< arrow::Array> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_tensor", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_tensor, "PyObject *(std::shared_ptr< arrow::Tensor> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_column", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_column, "PyObject *(std::shared_ptr< arrow::Column> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_table", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_table, "PyObject *(std::shared_ptr< arrow::Table> const &)") < 0) goto bad; | ||
| if (__Pyx_ImportFunction(module, "pyarrow_wrap_batch", (void (**)(void))&__pyx_api_f_7pyarrow_3lib_pyarrow_wrap_batch, "PyObject *(std::shared_ptr< arrow::RecordBatch> const &)") < 0) goto bad; | ||
| Py_DECREF(module); module = 0; | ||
| return 0; | ||
| bad: | ||
| Py_XDECREF(module); | ||
| return -1; | ||
| } | ||
|
|
||
| #endif /* !__PYX_HAVE_API__pyarrow__lib */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you 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. | ||
|
|
||
| from libcpp.memory cimport shared_ptr | ||
| from pyarrow.includes.libarrow cimport (CArray, CBuffer, CColumn, CDataType, | ||
| CField, CRecordBatch, CSchema, | ||
| CTable, CTensor) | ||
|
|
||
|
|
||
| cdef extern from "arrow/python/pyarrow.h" namespace "arrow::py": | ||
| cdef int import_pyarrow() except -1 | ||
| cdef object wrap_buffer(const shared_ptr[CBuffer]& buffer) | ||
| cdef object wrap_data_type(const shared_ptr[CDataType]& type) | ||
| cdef object wrap_field(const shared_ptr[CField]& field) | ||
| cdef object wrap_schema(const shared_ptr[CSchema]& schema) | ||
| cdef object wrap_array(const shared_ptr[CArray]& sp_array) | ||
| cdef object wrap_tensor(const shared_ptr[CTensor]& sp_tensor) | ||
| cdef object wrap_column(const shared_ptr[CColumn]& ccolumn) | ||
| cdef object wrap_table(const shared_ptr[CTable]& ctable) | ||
| cdef object wrap_batch(const shared_ptr[CRecordBatch]& cbatch) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You won't be able to call these from C without wrapping them into
extern "C" { .. }" due to the name mangling. Also I would be astonished if plain C code could instantiatestd::shared_ptr`.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated the PR title and comments to indicate this is a C++ API and not a C API (because the arguments are STL types)