Added Memory C-API functions to dpctl_capi.h

Renamed functions to avoid name clashes for get_queue_ref/get_context_ref
defined for different signatures. (C-API requires names to be different).

Adjsuted tests to reflect changes in C-API names

Author: oleksandr-pavlyk

dpctl/apis/include/dpctl_capi.h

@@ -36,6 +36,8 @@
 #include "../_sycl_event_api.h"
 #include "../_sycl_queue.h"
 #include "../_sycl_queue_api.h"
+#include "../memory/_memory.h"
+#include "../memory/_memory_api.h"
 // clang-format on
 
 /*
@@ -50,6 +52,6 @@ void import_dpctl(void)
     import_dpctl___sycl_context();
     import_dpctl___sycl_event();
     import_dpctl___sycl_queue();
-
+    import_dpctl__memory___memory();
     return;
 }

dpctl/memory/_memory.pyx

@@ -751,20 +751,20 @@ def as_usm_memory(obj):
         )
 
 
-cdef api DPCTLSyclUSMRef get_usm_pointer(_Memory obj):
+cdef api DPCTLSyclUSMRef Memory_get_usm_pointer(_Memory obj):
     "Pointer of USM allocation"
     return obj.memory_ptr
 
-cdef api DPCTLSyclContextRef get_context_ref(_Memory obj):
+cdef api DPCTLSyclContextRef Memory_get_context_ref(_Memory obj):
     "Context reference to which USM allocation is bound"
     return obj.queue._context.get_context_ref()
 
-cdef api DPCTLSyclQueueRef get_queue_ref(_Memory obj):
+cdef api DPCTLSyclQueueRef Memory_get_queue_ref(_Memory obj):
     """Queue associated with this allocation, used
     for copying, population, etc."""
     return obj.queue.get_queue_ref()
 
-cdef api size_t get_nbytes(_Memory obj):
+cdef api size_t Memory_get_nbytes(_Memory obj):
     "Size of the allocation in bytes."
     return <size_t>obj.nbytes
 

dpctl/tests/test_sycl_usm.py

@@ -530,9 +530,10 @@ def test_cpython_api(memory_ctor):
     mobj = memory_ctor(1024)
     mod = sys.modules[mobj.__class__.__module__]
     # get capsules storing function pointers
-    mem_ptr_fn_cap = mod.__pyx_capi__["get_usm_pointer"]
-    mem_ctx_ref_fn_cap = mod.__pyx_capi__["get_context_ref"]
-    mem_nby_fn_cap = mod.__pyx_capi__["get_nbytes"]
+    mem_ptr_fn_cap = mod.__pyx_capi__["Memory_get_usm_pointer"]
+    mem_q_ref_fn_cap = mod.__pyx_capi__["Memory_get_queue_ref"]
+    mem_ctx_ref_fn_cap = mod.__pyx_capi__["Memory_get_context_ref"]
+    mem_nby_fn_cap = mod.__pyx_capi__["Memory_get_nbytes"]
     # construct Python callable to invoke "get_usm_pointer"
     cap_ptr_fn = ctypes.pythonapi.PyCapsule_GetPointer
     cap_ptr_fn.restype = ctypes.c_void_p
@@ -543,12 +544,16 @@ def test_cpython_api(memory_ctor):
     mem_ctx_ref_fn_ptr = cap_ptr_fn(
         mem_ctx_ref_fn_cap, b"DPCTLSyclContextRef (struct Py_MemoryObject *)"
     )
+    mem_q_ref_fn_ptr = cap_ptr_fn(
+        mem_q_ref_fn_cap, b"DPCTLSyclQueueRef (struct Py_MemoryObject *)"
+    )
     mem_nby_fn_ptr = cap_ptr_fn(
         mem_nby_fn_cap, b"size_t (struct Py_MemoryObject *)"
     )
     callable_maker = ctypes.PYFUNCTYPE(ctypes.c_void_p, ctypes.py_object)
     get_ptr_fn = callable_maker(mem_ptr_fn_ptr)
     get_ctx_ref_fn = callable_maker(mem_ctx_ref_fn_ptr)
+    get_q_ref_fn = callable_maker(mem_q_ref_fn_ptr)
     get_nby_fn = callable_maker(mem_nby_fn_ptr)
 
     capi_ptr = get_ptr_fn(mobj)
@@ -557,6 +562,9 @@ def test_cpython_api(memory_ctor):
     capi_ctx_ref = get_ctx_ref_fn(mobj)
     direct_ctx_ref = mobj._context.addressof_ref()
     assert capi_ctx_ref == direct_ctx_ref
+    capi_q_ref = get_q_ref_fn(mobj)
+    direct_q_ref = mobj.sycl_queue.addressof_ref()
+    assert capi_q_ref == direct_q_ref
     capi_nbytes = get_nby_fn(mobj)
     direct_nbytes = mobj.nbytes
     assert capi_nbytes == direct_nbytes