File tree Expand file tree Collapse file tree 6 files changed +100
-483
lines changed
Expand file tree Collapse file tree 6 files changed +100
-483
lines changed Original file line number Diff line number Diff line change @@ -344,16 +344,5 @@ if(DEFINED SKBUILD)
344344 set (_ignore_me ${SKBUILD} )
345345endif ()
346346
347- # DpctlExtCAPI: Interface library for dpctl_ext C-API
348- # Provides access to:
349- # 1. Public C-API headers from dpctl_ext/apis/include
350- # 2. Generated Cython headers via per-target header interface libraries
351-
352- add_library (DpctlExtCAPI INTERFACE )
353- target_include_directories (
354- DpctlExtCAPI
355- INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} /dpctl_ext/apis/include
356- )
357-
358347add_subdirectory (dpctl_ext )
359348add_subdirectory (dpnp )
Original file line number Diff line number Diff line change @@ -199,12 +199,4 @@ function(build_dpctl_ext _trgt _src _dest)
199199 target_include_directories (${_trgt_headers} INTERFACE ${_trgt_headers_dir} )
200200endfunction ()
201201
202- # Install dpctl_ext C-API headers (similar to dpctl's C-API installation)
203- install (
204- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} /apis/include/
205- DESTINATION ${CMAKE_INSTALL_PREFIX} /dpctl_ext/include
206- FILES_MATCHING
207- REGEX "\\ .h(pp)?$"
208- )
209-
210202add_subdirectory (tensor )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -34,8 +34,6 @@ foreach(_cy_file ${_cython_sources})
3434 get_filename_component (_trgt ${_cy_file} NAME_WLE )
3535 build_dpctl_ext (${_trgt} ${_cy_file} "dpctl_ext/tensor" RELATIVE_PATH ".." )
3636 target_include_directories (${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} /include )
37- # target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
38- target_link_libraries (DpctlExtCAPI INTERFACE ${_trgt} _headers )
3937endforeach ()
4038
4139if (WIN32 )
@@ -318,6 +316,7 @@ foreach(python_module_name ${_py_trgts})
318316 ${Dpctl_INCLUDE_DIR}
319317 ${CMAKE_CURRENT_SOURCE_DIR} /libtensor/include
320318 ${CMAKE_CURRENT_SOURCE_DIR} /libtensor/source/
319+ ${CMAKE_BINARY_DIR} # For generated Cython headers
321320 )
322321 target_link_options (${python_module_name} PRIVATE ${_linker_options} )
323322 if (DPCTL_GENERATE_COVERAGE)
@@ -343,11 +342,8 @@ foreach(python_module_name ${_py_trgts})
343342 PRIVATE ${_dpnp_sycl_target_link_options}
344343 )
345344 endif ()
346- # TODO: update source so they reference individual libraries instead of
347- # dpctl4pybind11.hpp. It will allow to simplify dependency tree
348- # NOTE: dpctl C-API is resolved at runtime via Python
349- # target_link_libraries(${python_module_name} PRIVATE DpctlCAPI)
350- target_link_libraries (${python_module_name} PRIVATE DpctlExtCAPI )
345+ # Ensure Cython modules build first so _usmarray.h exists
346+ add_dependencies (${python_module_name} _usmarray )
351347 if (DPNP_WITH_REDIST)
352348 set_target_properties (
353349 ${python_module_name}
You can’t perform that action at this time.
0 commit comments