Merge pull request #752 from IntelPython/restore-cython-coverage

CYTHON_TRACE must be set when generating coverage

Author: oleksandr-pavlyk

dpctl/.gitignore

@@ -1,5 +1,6 @@
 *.so
 *.cpp
+*.cxx
 *.c
 *.h
 memory/*.h

dpctl/CMakeLists.txt

@@ -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)
@@ -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})
@@ -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()