Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Improve cython externs #59

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Improve cython externs #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd32c6
Improve cython externs
sjperkins Sep 28, 2023
304b973
[skip ci] Update HISTORY.rst
sjperkins Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ History

X.Y.Z (YYYY-MM-DD)
------------------
* Introduce a more canonical C++ project structure (:pr:`57`)
* Introduce a more canonical C++ project structure (:pr:`57`. :pr:`59`)
* Consistently use CamelCase throughout the C++ layer (:pr:`56`)
* Support getcol, tabledesc and getcoldesc (:pr:`55`, :pr:`58`)
* Enable initial OSX support in the build process (:pr:`54`)
Expand Down
12 changes: 6 additions & 6 deletions arcae/arrow_tables.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ cdef extern from "<climits>" nogil:
cdef unsigned int UINT_MAX


cdef extern from "../cpp/arcae/service_locator.h" namespace "arcae" nogil:
cdef extern from "arcae/service_locator.h" namespace "arcae" nogil:
cdef cppclass CServiceLocator" arcae::ServiceLocator":
@staticmethod
CConfiguration & configuration" ServiceLocator::configuration"()

cdef extern from "../cpp/arcae/configuration.h" namespace "arcae" nogil:
cdef extern from "arcae/configuration.h" namespace "arcae" nogil:
cdef cppclass CConfiguration" arcae::Configuration":
void Set" Configuration::Set"(const string & key, string value)
CResult[string] Get" Configuration::Get"(const string & key)
CResult[bool] Delete" Configuration::Delete"(const string & key)
vector[string] GetKeys" Configuration::GetKeys"()
size_t Size" Configuration::Size"()

cdef extern from "../cpp/arcae/descriptor.h" namespace "arcae" nogil:
cdef extern from "arcae/descriptor.h" namespace "arcae" nogil:
cdef CResult[string] CMSDescriptor" arcae::MSDescriptor"(const string & table, bool complete)

cdef extern from "../cpp/arcae/safe_table_proxy.h" namespace "arcae" nogil:
cdef extern from "arcae/safe_table_proxy.h" namespace "arcae" nogil:
cdef cppclass CCasaTable" arcae::SafeTableProxy":
@staticmethod
CResult[bool] Close" SafeTableProxy::Close"()
Expand All @@ -45,7 +45,7 @@ cdef extern from "../cpp/arcae/safe_table_proxy.h" namespace "arcae" nogil:
CResult[bool] AddRows " SafeTableProxy::AddRows"(unsigned int nrows)


cdef extern from "../cpp/arcae/table_factory.h" namespace "arcae" nogil:
cdef extern from "arcae/table_factory.h" namespace "arcae" nogil:
cdef CResult[shared_ptr[CCasaTable]] COpenTable" arcae::OpenTable"(
const string & filename)
cdef CResult[shared_ptr[CCasaTable]] CDefaultMS" arcae::DefaultMS"(
Expand All @@ -55,7 +55,7 @@ cdef extern from "../cpp/arcae/table_factory.h" namespace "arcae" nogil:
const string & json_dminfo)


cdef extern from "../cpp/arcae/complex_type.h" namespace "arcae" nogil:
cdef extern from "arcae/complex_type.h" namespace "arcae" nogil:
cdef cppclass CComplexType" arcae::ComplexType"(CExtensionType):
shared_ptr[CDataType] value_type" ComplexType::value_type"()
string extension_name()
Expand Down
3 changes: 0 additions & 3 deletions arcae/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,6 @@ def generate_getcol_table(path):
T.putcell("TIME", i, i)
T.putcell("STRING", i, str(i))
T.putcell("NESTED_STRING", i, {"shape": (2, 4), "array": [str(i)] * 2 * 4})
#T.putcell("NESTED_STRING", i, np.full((2, i + 1), str(i)))

#[str(i)] * 2 * (i+1)

return table_name

Expand Down