|
28 | 28 |
|
29 | 29 | #pragma once |
30 | 30 |
|
31 | | -// Include dpctl SYCL interface from external dpctl package |
32 | | -#include "syclinterface/dpctl_sycl_extension_interface.h" |
33 | | -#include "syclinterface/dpctl_sycl_types.h" |
34 | | - |
35 | | -#ifdef __cplusplus |
36 | | -#define CYTHON_EXTERN_C extern "C" |
37 | | -#else |
38 | | -#define CYTHON_EXTERN_C |
39 | | -#endif |
40 | | - |
41 | | -// Include dpctl C-API headers (both declarations and import functions) |
42 | | -#include "dpctl/_sycl_context.h" |
43 | | -#include "dpctl/_sycl_context_api.h" |
44 | | -#include "dpctl/_sycl_device.h" |
45 | | -#include "dpctl/_sycl_device_api.h" |
46 | | -#include "dpctl/_sycl_event.h" |
47 | | -#include "dpctl/_sycl_event_api.h" |
48 | | -#include "dpctl/_sycl_queue.h" |
49 | | -#include "dpctl/_sycl_queue_api.h" |
50 | | -#include "dpctl/memory/_memory.h" |
51 | | -#include "dpctl/memory/_memory_api.h" |
52 | | -#include "dpctl/program/_program.h" |
53 | | -#include "dpctl/program/_program_api.h" |
| 31 | +// Include dpctl C-API headers |
| 32 | +#include "dpctl_capi.h" |
54 | 33 |
|
55 | 34 | // Include generated Cython headers for usm_ndarray |
56 | 35 | // (struct definition and constants only) |
@@ -253,14 +232,9 @@ class dpctl_capi |
253 | 232 | default_usm_memory_{}, default_usm_ndarray_{}, as_usm_memory_{} |
254 | 233 |
|
255 | 234 | { |
256 | | - // Import dpctl SYCL interface modules |
257 | | - // This imports python modules and initializes pointers to Python types |
258 | | - import_dpctl___sycl_device(); |
259 | | - import_dpctl___sycl_context(); |
260 | | - import_dpctl___sycl_event(); |
261 | | - import_dpctl___sycl_queue(); |
262 | | - import_dpctl__memory___memory(); |
263 | | - import_dpctl__program___program(); |
| 235 | + // Import dpctl C-API |
| 236 | + // (device, context, event, queue, memory, program) |
| 237 | + import_dpctl(); |
264 | 238 | // Import dpnp tensor module for PyUSMArrayType |
265 | 239 | import_dpnp__tensor___usmarray(); |
266 | 240 |
|
|
0 commit comments