Path adjustment for nanoarrow include, pkg-config update

single-cell-data · Apr 4, 2024 · f2ea6f5 · f2ea6f5
1 parent 46aebeb
commit f2ea6f5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 15 deletions.
diff --git a/apis/r/inst/include/tiledbsoma_types.h b/apis/r/inst/include/tiledbsoma_types.h
@@ -15,7 +15,7 @@
 #define TILEDB_NO_API_DEPRECATION_WARNINGS
 #endif
 
-#include <tiledbsoma/nanoarrow/nanoarrow.h> // for C interface to Arrow
+#include <nanoarrow/nanoarrow.h>            // for C interface to Arrow
 #include <tiledb/tiledb>					// for QueryCondition etc
 #define ARROW_SCHEMA_AND_ARRAY_DEFINED 1
 #include <tiledbsoma/tiledbsoma>

diff --git a/apis/r/src/rinterface.cpp b/apis/r/src/rinterface.cpp
@@ -1,6 +1,6 @@
 #include <Rcpp.h>                               // for R interface to C++
 #include <nanoarrow/r.h>                        // for C interface to Arrow (via R package)
-#include <tiledbsoma/nanoarrow/nanoarrow.hpp>   // for C/C++ interface to Arrow
+#include <nanoarrow/nanoarrow.hpp>              // for C/C++ interface to Arrow
 #include <RcppInt64>                            // for fromInteger64
 
 // we currently get deprecation warnings by default which are noisy

diff --git a/apis/r/src/riterator.cpp b/apis/r/src/riterator.cpp
@@ -5,7 +5,7 @@
 
 #include <Rcpp.h>                        // for R interface to C++
 #include <nanoarrow/r.h>                 // for C interface to Arrow (via R package nanoarrow)
-#include <tiledbsoma/nanoarrow/nanoarrow.h>
+#include <nanoarrow/nanoarrow.h>
 #include <RcppInt64>                    // for fromInteger64
 
 #include <tiledb/tiledb>

diff --git a/apis/r/src/rutilities.cpp b/apis/r/src/rutilities.cpp
@@ -5,7 +5,7 @@
 #endif
 
 #include <Rcpp.h>                           // for R interface to C++
-#include <tiledbsoma/nanoarrow/nanoarrow.h> // for C interface to Arrow
+#include <nanoarrow/nanoarrow.h>            // for C interface to Arrow
 #include <RcppInt64>                        // for fromInteger64
 #include <tiledbsoma/tiledbsoma>
 

diff --git a/apis/r/src/xptr-utils.h b/apis/r/src/xptr-utils.h
@@ -24,9 +24,6 @@ const tiledb_xptr_object tiledb_xptr_vlv_buf_t                   { 180 };
 const tiledb_xptr_object tiledb_xptr_query_buf_t                 { 190 };
 
 // the definitions above are internal to tiledb-r but we need a new value here if we want tag the external pointer
-const tiledb_xptr_object tiledb_arrow_array_t                    { 300 };
-const tiledb_xptr_object tiledb_arrow_schema_t                   { 310 };
-
 const tiledb_xptr_object tiledb_soma_reader_t                    { 500 };
 
 // templated checkers for external pointer tags
@@ -52,10 +49,6 @@ template <> inline const int32_t XPtrTagType<tiledb::VFS>                  = til
 // template <> inline const int32_t XPtrTagType<vlv_buf_t>                    = tiledb_xptr_vlv_buf_t;
 // template <> inline const int32_t XPtrTagType<query_buf_t>                  = tiledb_xptr_query_buf_t;
 
-
-template <> inline const int32_t XPtrTagType<ArrowArray>             	   = tiledb_arrow_array_t;
-template <> inline const int32_t XPtrTagType<ArrowSchema>             	   = tiledb_arrow_schema_t;
-
 template <> inline const int32_t XPtrTagType<tdbs::SOMAArray>             = tiledb_soma_reader_t;
 
 template <typename T> Rcpp::XPtr<T> make_xptr(T* p, bool finalize=true) {
@@ -81,4 +74,3 @@ template<typename T> void check_xptr_tag(Rcpp::XPtr<T> ptr) {
 // in rinterface.cpp
 Rcpp::XPtr<ArrowSchema> schema_owning_xptr(void);
 Rcpp::XPtr<ArrowArray> array_owning_xptr(void);
-
diff --git a/libtiledbsoma/cmake/inputs/tiledbsoma.pc.in b/libtiledbsoma/cmake/inputs/tiledbsoma.pc.in
@@ -9,6 +9,6 @@ URL: https://github.com/single-cell-data/TileDB-SOMA
 Version: @VERSION@
 Requires: @PKGCONF_REQ_PUB@
 Requires.private: @PKGCONF_REQ_PRIV@
-Cflags: -I"${includedir}"
+Cflags: -I"${includedir}" -I"${includedir}/tiledbsoma"
 Libs: -L"${libdir}" -ltiledbsoma
-Libs.private: -L"${libdir}" -ltiledbsoma @PKGCONF_LIBS_PRIV@
+Libs.private: -L"${libdir}" -ltiledbsoma @PKGCONF_LIBS_PRIV@
diff --git a/libtiledbsoma/src/utils/arrow_adapter.h b/libtiledbsoma/src/utils/arrow_adapter.h
@@ -8,7 +8,7 @@
 // https://arrow.apache.org/docs/format/Columnar.html#buffer-listing-for-each-layout
 // https://arrow.apache.org/docs/format/CDataInterface.html#exporting-a-simple-int32-array
 
-#include "tiledbsoma/nanoarrow/nanoarrow.hpp"
+#include "nanoarrow/nanoarrow.hpp"
 
 namespace tiledbsoma {