Skip to content

CYTHON_TRACE must be set when generating coverage #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-pavlyk merged 4 commits into from
Feb 1, 2022
Merged

CYTHON_TRACE must be set when generating coverage #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1a8bf2
CYTHON_TRACE must be set when generating coverage
oleksandr-pavlyk Jan 28, 2022
b124c94
Renamed copy_generated_headers.cmake -> copy_existing.cmake
oleksandr-pavlyk Jan 29, 2022
ccacd4a
Changes for Cython.Coverage to work with scikit-build
oleksandr-pavlyk Jan 30, 2022
6fab702
Added *.cxx to dpctl/.gitignore file
oleksandr-pavlyk Jan 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dpctl/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.so
*.cpp
*.cxx
*.c
*.h
memory/*.h
Expand Down
25 changes: 22 additions & 3 deletions dpctl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

find_package(PythonExtensions REQUIRED)
find_package(NumPy REQUIRED)

set(CYTHON_FLAGS "-w ${CMAKE_SOURCE_DIR}")
find_package(Cython REQUIRED)

if(WIN32)
Expand Down Expand Up @@ -111,6 +113,10 @@ function(build_dpctl_ext _trgt _src _dest)
add_library(${_trgt} MODULE ${_generated_src})
target_include_directories(${_trgt} PRIVATE ${NumPy_INCLUDE_DIR} ${DPCTL_INCLUDE_DIR})
add_dependencies(${_trgt} _build_time_create_dpctl_include)
if (DPCTL_GENERATE_COVERAGE)
target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1)
target_compile_options(${_trgt} PRIVATE -fno-sycl-use-footer)
endif()
target_link_libraries(${_trgt} DPCTLSyclInterface)
target_link_options(${_trgt} PRIVATE "LINKER:${DPCTL_LDFLAGS}")
python_extension_module(${_trgt})
Expand All @@ -124,15 +130,28 @@ function(build_dpctl_ext _trgt _src _dest)
COMMAND ${CMAKE_COMMAND}
-DSOURCE_FILE=${_generated_public_h}
-DDEST=${CMAKE_CURRENT_SOURCE_DIR}
-P ${CMAKE_SOURCE_DIR}/dpctl/cmake/copy_generated_headers.cmake
-P ${CMAKE_SOURCE_DIR}/dpctl/cmake/copy_existing.cmake
COMMAND ${CMAKE_COMMAND}
-DSOURCE_FILE=${_generated_api_h}
-DDEST=${CMAKE_CURRENT_SOURCE_DIR}
-P ${CMAKE_SOURCE_DIR}/dpctl/cmake/copy_generated_headers.cmake
-P ${CMAKE_SOURCE_DIR}/dpctl/cmake/copy_existing.cmake
DEPENDS ${_trgt}
VERBATIM
COMMENT "Copying Cython-generated headers to destination"
COMMENT "Copying Cython-generated headers to dpctl"
)
if (DPCTL_GENERATE_COVERAGE)
set(_copy_cxx_trgt "${_trgt}_copy_cxx")
add_custom_target(
${_copy_cxx_trgt} ALL
COMMAND ${CMAKE_COMMAND}
-DSOURCE_FILE=${_generated_src}
-DDEST=${CMAKE_CURRENT_SOURCE_DIR}
-P ${CMAKE_SOURCE_DIR}/dpctl/cmake/copy_existing.cmake
DEPENDS ${_trgt}
VERBATIM
COMMENT "Copying Cython-generated source to dpctl"
)
endif()
install(TARGETS ${_trgt} LIBRARY DESTINATION ${_dest})
endfunction()

Expand Down
0 dpctl/cmake/copy_generated_headers.cmake → dpctl/cmake/copy_existing.cmake
View file
Open in desktop
File renamed without changes.