Try autopxd2

Author: WillAyd

python/meson.build

@@ -29,7 +29,9 @@ project(
         # due to https://github.com/mesonbuild/meson/issues/6728
         'arrow-nanoarrow:ipc=true',
         'arrow-nanoarrow:device=true',
-        'arrow-nanoarrow:namespace=PythonPkg',
+        # Adding this namespace doesn't work with the autopxd generation
+        # is that a problem?
+        #'arrow-nanoarrow:namespace=PythonPkg',
     ],
 )
 

python/pyproject.toml

@@ -38,6 +38,7 @@ Changelog = "https://github.com/apache/arrow-nanoarrow/blob/main/CHANGELOG.md"
 
 [build-system]
 requires = [
+    "autopxd2",
     "meson>=1.3.0",
     "meson-python",
     "Cython"

python/src/nanoarrow/_array.pyx

@@ -76,11 +76,14 @@ from nanoarrow_c cimport (
     NANOARROW_VALIDATION_LEVEL_FULL,
     NANOARROW_VALIDATION_LEVEL_MINIMAL,
     NANOARROW_VALIDATION_LEVEL_NONE,
+)
+
+from nanoarrow_macros cimport (
     NANOARROW_OK,
+    ARROW_DEVICE_CPU,
 )
 
 from nanoarrow_device_c cimport (
-    ARROW_DEVICE_CPU,
     ArrowDeviceType,
     ArrowDeviceArray,
     ArrowDeviceArrayInit,

python/src/nanoarrow/_buffer.pyx

@@ -35,7 +35,6 @@ from cpython cimport (
 from cpython.ref cimport Py_INCREF, Py_DECREF
 
 from nanoarrow_c cimport (
-    NANOARROW_OK,
     ArrowMalloc,
     ArrowFree,
     ArrowType,
@@ -55,12 +54,14 @@ from nanoarrow_c cimport (
     ArrowBufferMove,
 )
 
-from nanoarrow_device_c cimport (
+from nanoarrow_macros cimport (
+    NANOARROW_OK,
     ARROW_DEVICE_CPU,
     ARROW_DEVICE_CUDA,
-    ArrowDevice,
 )
 
+from nanoarrow_device_c cimport ArrowDevice
+
 from nanoarrow_dlpack cimport (
     DLDataType,
     DLDevice,

python/src/nanoarrow/_device.pyx

@@ -20,6 +20,13 @@
 from libc.stdint cimport uintptr_t, int64_t
 
 from nanoarrow_device_c cimport (
+    ArrowDevice,
+    ArrowDeviceCpu,
+    ArrowDeviceResolve
+)
+
+from nanoarrow_macros cimport (
+    NANOARROW_OK,
     ARROW_DEVICE_CPU,
     ARROW_DEVICE_CUDA,
     ARROW_DEVICE_CUDA_HOST,
@@ -34,9 +41,6 @@ from nanoarrow_device_c cimport (
     ARROW_DEVICE_ONEAPI,
     ARROW_DEVICE_WEBGPU,
     ARROW_DEVICE_HEXAGON,
-    ArrowDevice,
-    ArrowDeviceCpu,
-    ArrowDeviceResolve
 )
 
 from nanoarrow._utils cimport Error

python/src/nanoarrow/_ipc_lib.pyx

@@ -30,9 +30,10 @@ from nanoarrow_c cimport (
     ArrowSchema,
     ArrowErrorCode,
     ArrowError,
-    NANOARROW_OK,
 )
 
+from nanoarrow_macros cimport NANOARROW_OK
+
 from nanoarrow._schema cimport CSchema
 from nanoarrow._array cimport CArrayView
 from nanoarrow._utils cimport Error

python/src/nanoarrow/_schema.pyx

@@ -22,9 +22,6 @@ from cpython.bytes cimport PyBytes_FromStringAndSize, PyBytes_AsString, PyBytes_
 from cpython.pycapsule cimport PyCapsule_GetPointer
 
 from nanoarrow_c cimport (
-    ARROW_FLAG_DICTIONARY_ORDERED,
-    ARROW_FLAG_MAP_KEYS_SORTED,
-    ARROW_FLAG_NULLABLE,
     ArrowFree,
     ArrowLayout,
     ArrowMalloc,
@@ -54,13 +51,19 @@ from nanoarrow_c cimport (
     ArrowType,
     ArrowTypeString,
     NANOARROW_BUFFER_TYPE_NONE,
-    NANOARROW_MAX_FIXED_BUFFERS,
     NANOARROW_TIME_UNIT_SECOND,
     NANOARROW_TIME_UNIT_MILLI,
     NANOARROW_TIME_UNIT_MICRO,
     NANOARROW_TIME_UNIT_NANO,
 )
 
+from nanoarrow_macros cimport (
+    ARROW_FLAG_DICTIONARY_ORDERED,
+    ARROW_FLAG_MAP_KEYS_SORTED,
+    ARROW_FLAG_NULLABLE,
+    NANOARROW_MAX_FIXED_BUFFERS,
+)
+
 from nanoarrow cimport _types
 from nanoarrow._buffer cimport CBuffer
 from nanoarrow._utils cimport alloc_c_schema, Error

python/src/nanoarrow/_utils.pyx

@@ -54,10 +54,11 @@ from nanoarrow_c cimport (
     ArrowNanoarrowVersion,
     ArrowSchema,
     ArrowSchemaRelease,
-    NANOARROW_OK,
     NANOARROW_TYPE_UNINITIALIZED
 )
 
+from nanoarrow_macros cimport NANOARROW_OK
+
 from nanoarrow_device_c cimport (
     ArrowDeviceArray
 )

python/src/nanoarrow/meson.build

@@ -23,6 +23,43 @@ nanoarrow_device_dep = nanoarrow_proj.get_variable('nanoarrow_device_dep')
 
 py = import('python').find_installation(pure: false)
 
+nanoarrow_c = custom_target(
+    'nanoarrow_c',
+    output: 'nanoarrow_c.pxd',
+    command: [
+        'autopxd',
+        '-I',
+        meson.project_source_root() / 'subprojects/arrow-nanoarrow/src/',
+        '-I',
+        meson.project_build_root() / 'subprojects/arrow-nanoarrow/src/',
+        # ideally we could use @INPUT@ but that will throw a sandboxing violation
+        meson.project_source_root() /  'subprojects/arrow-nanoarrow/src/nanoarrow/nanoarrow.h',
+        '@OUTPUT@',
+    ],
+)
+nanoarrow_c_dep = declare_dependency(
+    sources: nanoarrow_c,
+)
+
+nanoarrow_device_c = custom_target(
+    'nanoarrow_device_c',
+    output: 'nanoarrow_device_c.pxd',
+    command: [
+        'autopxd',
+        '-I',
+        meson.project_source_root() / 'subprojects/arrow-nanoarrow/src/',
+        '-I',
+        meson.project_build_root() / 'subprojects/arrow-nanoarrow/src/',
+        # ideally we could use @INPUT@ but that will throw a sandboxing violation
+        meson.project_source_root() /  'subprojects/arrow-nanoarrow/src/nanoarrow/nanoarrow_device.h',
+        '@OUTPUT@',
+    ],
+)
+
+nanoarrow_device_c_dep = declare_dependency(
+    sources: nanoarrow_device_c,
+)
+
 cyfiles = [
     '_array.pyx',
     '_array_stream.pyx',
@@ -37,14 +74,16 @@ cyfiles = [
 cython_args = [
     '--include-dir',
     meson.current_source_dir(),
+    '--include-dir',
+    meson.current_build_dir(),
 ]
 if get_option('buildtype') in ['debug', 'debugoptimized']
     cython_args += ['--gdb']
 endif
 
 fs = import('fs')
 foreach cyf : cyfiles
-  cyfile_deps = [nanoarrow_dep]
+  cyfile_deps = [nanoarrow_dep, nanoarrow_c_dep, nanoarrow_device_c_dep]
 
   stem = fs.stem(cyf)
   if stem in ['_array', '_device']
@@ -76,6 +115,7 @@ py_sources = [
     'device.py',
     'ipc.py',
     'iterator.py',
+    'nanoarrow_macros.pxd',
     '_repr_utils.py',
     'schema.py',
     'visitor.py',