Merge branch 'remove_c_api_tensor' into move_dpctl_ext_to_dpnp_tensor

Author: vlad-perevezentsev

CMakeLists.txt

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

dpctl_ext/CMakeLists.txt

@@ -39,7 +39,8 @@ set(_module_src
 pybind11_add_module(${python_module_name} MODULE ${_module_src})
 add_sycl_to_target(TARGET ${python_module_name} SOURCES ${_module_src})
 
-target_link_libraries(${python_module_name} PRIVATE DpnpTensorCAPI)
+# Ensure Cython modules build first so _usmarray.h exists
+add_dependencies(${python_module_name} _usmarray)
 
 if(_dpnp_sycl_targets)
     # make fat binary
@@ -77,7 +78,11 @@ target_include_directories(
 target_include_directories(
     ${python_module_name}
     SYSTEM
-    PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
+    PRIVATE
+        ${SYCL_INCLUDE_DIR}
+        ${Dpctl_INCLUDE_DIRS}
+        ${Dpctl_TENSOR_INCLUDE_DIR}
+        ${CMAKE_BINARY_DIR} # For generated Cython headers
 )
 
 if(WIN32)

dpctl_ext/apis/include/dpctl_ext_capi.h

@@ -33,7 +33,8 @@ set(_module_src ${CMAKE_CURRENT_SOURCE_DIR}/fft_py.cpp)
 pybind11_add_module(${python_module_name} MODULE ${_module_src})
 add_sycl_to_target(TARGET ${python_module_name} SOURCES ${_module_src})
 
-target_link_libraries(${python_module_name} PRIVATE DpnpTensorCAPI)
+# Ensure Cython modules build first so _usmarray.h exists
+add_dependencies(${python_module_name} _usmarray)
 
 if(_dpnp_sycl_targets)
     # make fat binary
@@ -70,7 +71,11 @@ target_include_directories(
 target_include_directories(
     ${python_module_name}
     SYSTEM
-    PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
+    PRIVATE
+        ${SYCL_INCLUDE_DIR}
+        ${Dpctl_INCLUDE_DIRS}
+        ${Dpctl_TENSOR_INCLUDE_DIR}
+        ${CMAKE_BINARY_DIR} # For generated Cython headers
 )
 
 if(WIN32)