Merge include-dpctl-tensor into move_tensor_tests

Author: vlad-perevezentsev

.github/workflows/generate_coverage.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Generate coverage and push to Coveralls.io
 
     runs-on: ubuntu-latest
-    timeout-minutes: 120
+    timeout-minutes: 150
 
     permissions:
       # Needed to cancel any previous runs that are not completed for a given workflow
@@ -122,7 +122,7 @@ jobs:
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
           shell: bash
-          timeout_minutes: 90
+          timeout_minutes: 120
           max_attempts: 5
           retry_on: error
           command: |

CMakeLists.txt

@@ -344,16 +344,5 @@ if(DEFINED SKBUILD)
     set(_ignore_me ${SKBUILD})
 endif()
 
-# DpctlExtCAPI: Interface library for dpctl_ext C-API
-# Provides access to:
-# 1. Public C-API headers from dpctl_ext/apis/include
-# 2. Generated Cython headers via per-target header interface libraries
-
-add_library(DpctlExtCAPI INTERFACE)
-target_include_directories(
-    DpctlExtCAPI
-    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/dpctl_ext/apis/include
-)
-
 add_subdirectory(dpctl_ext)
 add_subdirectory(dpnp)

dpctl_ext/CMakeLists.txt

@@ -199,12 +199,4 @@ function(build_dpctl_ext _trgt _src _dest)
     target_include_directories(${_trgt_headers} INTERFACE ${_trgt_headers_dir})
 endfunction()
 
-# Install dpctl_ext C-API headers (similar to dpctl's C-API installation)
-install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/apis/include/
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/dpctl_ext/include
-    FILES_MATCHING
-    REGEX "\\.h(pp)?$"
-)
-
 add_subdirectory(tensor)

dpctl_ext/tensor/CMakeLists.txt

@@ -34,8 +34,6 @@ foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
     build_dpctl_ext(${_trgt} ${_cy_file} "dpctl_ext/tensor" RELATIVE_PATH "..")
     target_include_directories(${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-    # target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
-    target_link_libraries(DpctlExtCAPI INTERFACE ${_trgt}_headers)
 endforeach()
 
 if(WIN32)
@@ -318,6 +316,7 @@ foreach(python_module_name ${_py_trgts})
             ${Dpctl_INCLUDE_DIR}
             ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/include
             ${CMAKE_CURRENT_SOURCE_DIR}/libtensor/source/
+            ${CMAKE_BINARY_DIR} # For generated Cython headers
     )
     target_link_options(${python_module_name} PRIVATE ${_linker_options})
     if(DPCTL_GENERATE_COVERAGE)
@@ -343,11 +342,8 @@ foreach(python_module_name ${_py_trgts})
             PRIVATE ${_dpnp_sycl_target_link_options}
         )
     endif()
-    # TODO: update source so they reference individual libraries instead of
-    #   dpctl4pybind11.hpp. It will allow to simplify dependency tree
-    # NOTE: dpctl C-API is resolved at runtime via Python
-    # target_link_libraries(${python_module_name} PRIVATE DpctlCAPI)
-    target_link_libraries(${python_module_name} PRIVATE DpctlExtCAPI)
+    # Ensure Cython modules build first so _usmarray.h exists
+    add_dependencies(${python_module_name} _usmarray)
     if(DPNP_WITH_REDIST)
         set_target_properties(
             ${python_module_name}

dpctl_ext/tensor/_ctors.py

@@ -46,6 +46,9 @@
     _empty_like_orderK,
     _from_numpy_empty_like_orderK,
 )
+from ._data_types import _get_dtype
+from ._device import normalize_queue_device
+from ._usmarray import _is_object_with_buffer_protocol
 
 __doc__ = "Implementation of creation functions in :module:`dpctl.tensor`"
 

dpctl_ext/tensor/_dlpack.pyx

@@ -1086,7 +1086,7 @@ def from_dlpack(x, /, *, device=None, copy=None):
         .. code-block:: python
 
             import dpctl
-            import dpctl.tensor as dpt
+            import dpctl_ext.tensor as dpt
 
             class Container:
                 "Helper class implementing `__dlpack__` protocol"

dpctl_ext/tensor/_scalar_utils.py

@@ -34,9 +34,6 @@
 # TODO: revert to `import dpctl.tensor...`
 # when dpnp fully migrates dpctl/tensor
 import dpctl_ext.tensor as dpt
-from dpctl_ext.tensor._usmarray import (
-    _is_object_with_buffer_protocol as _is_buffer,
-)
 
 from ._type_utils import (
     WeakBooleanType,
@@ -45,6 +42,7 @@
     WeakIntegralType,
     _to_device_supported_dtype,
 )
+from ._usmarray import _is_object_with_buffer_protocol as _is_buffer
 
 
 def _get_queue_usm_type(o):

dpctl_ext/tensor/_set_functions.py

@@ -33,7 +33,6 @@
 # TODO: revert to `import dpctl.tensor...`
 # when dpnp fully migrates dpctl/tensor
 import dpctl_ext.tensor as dpt
-from dpctl_ext.tensor._tensor_elementwise_impl import _not_equal, _subtract
 
 from ._copy_utils import _empty_like_orderK
 from ._scalar_utils import (
@@ -42,6 +41,7 @@
     _get_shape,
     _validate_dtype,
 )
+from ._tensor_elementwise_impl import _not_equal, _subtract
 from ._tensor_impl import (
     _copy_usm_ndarray_into_usm_ndarray,
     _extract,