Modularized retrieval of usm_ndarray_ptr

Use -O1 when compiling tensor_py for now to work around suspected issue
with loading of C-API functions.

Author: oleksandr-pavlyk

dpctl/apis/include/dpctl4pybind11.hpp

@@ -439,8 +439,7 @@ class usm_ndarray : public py::object
 
     char *get_data() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetData(raw_ar);
     }
@@ -452,16 +451,14 @@ class usm_ndarray : public py::object
 
     int get_ndim() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetNDim(raw_ar);
     }
 
     const py::ssize_t *get_shape_raw() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetShape(raw_ar);
     }
@@ -474,16 +471,14 @@ class usm_ndarray : public py::object
 
     const py::ssize_t *get_strides_raw() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetStrides(raw_ar);
     }
 
     py::ssize_t get_size() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         int ndim = UsmNDArray_GetNDim(raw_ar);
         const py::ssize_t *shape = UsmNDArray_GetShape(raw_ar);
@@ -499,8 +494,7 @@ class usm_ndarray : public py::object
 
     std::pair<py::ssize_t, py::ssize_t> get_minmax_offsets() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         int nd = UsmNDArray_GetNDim(raw_ar);
         const py::ssize_t *shape = UsmNDArray_GetShape(raw_ar);
@@ -533,33 +527,29 @@ class usm_ndarray : public py::object
 
     sycl::queue get_queue() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         DPCTLSyclQueueRef QRef = UsmNDArray_GetQueueRef(raw_ar);
         return *(reinterpret_cast<sycl::queue *>(QRef));
     }
 
     int get_typenum() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetTypenum(raw_ar);
     }
 
     int get_flags() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetFlags(raw_ar);
     }
 
     int get_elemsize() const
     {
-        PyObject *raw_o = this->ptr();
-        PyUSMArrayObject *raw_ar = reinterpret_cast<PyUSMArrayObject *>(raw_o);
+        PyUSMArrayObject *raw_ar = this->usm_array_ptr();
 
         return UsmNDArray_GetElementSize(raw_ar);
     }
@@ -575,6 +565,12 @@ class usm_ndarray : public py::object
         int flags = this->get_flags();
         return static_cast<bool>(flags & USM_ARRAY_F_CONTIGUOUS);
     }
+
+private:
+    PyUSMArrayObject *usm_array_ptr() const
+    {
+        return reinterpret_cast<PyUSMArrayObject *>(m_ptr);
+    }
 };
 
 } // end namespace tensor

dpctl/tensor/CMakeLists.txt

@@ -19,6 +19,8 @@ set(python_module_name _tensor_impl)
 pybind11_add_module(${python_module_name} MODULE
     ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/tensor_py.cpp
 )
+# FIXME: remove this once issue with dpctl_capi loading is fixed
+target_compile_options(${python_module_name} PRIVATE -O1)
 target_link_options(${python_module_name} PRIVATE -fsycl-device-code-split=per_kernel)
 target_include_directories(${python_module_name}
     PRIVATE