@@ -54,9 +54,9 @@ constexpr int platform_typeid_lookup(int I, Ints... Is)
5454 : platform_typeid_lookup < Concrete , Ts ...> (Is ...);
5555}
5656
57- struct dpctl_capi
57+ class dpctl_capi
5858{
59-
59+ public :
6060 // dpctl type objects
6161 PyTypeObject * Py_SyclDeviceType_ ;
6262 PyTypeObject * PySyclDeviceType_ ;
@@ -160,19 +160,19 @@ struct dpctl_capi
160160
161161 py ::object default_sycl_queue_pyobj ()
162162 {
163- return * default_sycl_queue ;
163+ return * default_sycl_queue_ ;
164164 }
165165 py ::object default_usm_memory_pyobj ()
166166 {
167- return * default_usm_memory ;
167+ return * default_usm_memory_ ;
168168 }
169169 py ::object default_usm_ndarray_pyobj ()
170170 {
171- return * default_usm_ndarray ;
171+ return * default_usm_ndarray_ ;
172172 }
173173 py ::object as_usm_memory_pyobj ()
174174 {
175- return * as_usm_memory ;
175+ return * as_usm_memory_ ;
176176 }
177177
178178private :
@@ -188,16 +188,14 @@ struct dpctl_capi
188188 }
189189 };
190190
191- std ::shared_ptr < py ::object > default_sycl_queue ;
192- std ::shared_ptr < py ::object > default_usm_memory ;
193- std ::shared_ptr < py ::object > default_usm_ndarray ;
194- std ::shared_ptr < py ::object > as_usm_memory ;
195- std ::shared_ptr < py ::object > default_sycl_kernel ;
196- std ::shared_ptr < py ::object > default_sycl_program ;
191+ std ::shared_ptr < py ::object > default_sycl_queue_ ;
192+ std ::shared_ptr < py ::object > default_usm_memory_ ;
193+ std ::shared_ptr < py ::object > default_usm_ndarray_ ;
194+ std ::shared_ptr < py ::object > as_usm_memory_ ;
197195
198196 dpctl_capi ()
199- : default_sycl_queue {}, default_usm_memory {}, default_usm_ndarray {},
200- as_usm_memory {}
197+ : default_sycl_queue_ {}, default_usm_memory_ {}, default_usm_ndarray_ {},
198+ as_usm_memory_ {}
201199 {
202200 // Import Cython-generated C-API for dpctl
203201 // This imports python modules and initializes
@@ -312,18 +310,18 @@ struct dpctl_capi
312310 py ::object py_sycl_queue = py ::reinterpret_steal < py ::object > (
313311 reinterpret_cast < PyObject * > (py_q_tmp ));
314312
315- default_sycl_queue = std ::shared_ptr < py ::object > (
313+ default_sycl_queue_ = std ::shared_ptr < py ::object > (
316314 new py ::object (py_sycl_queue ), Deleter {});
317315
318316 py ::module_ mod_memory = py ::module_ ::import ("dpctl.memory" );
319317 py ::object py_as_usm_memory = mod_memory .attr ("as_usm_memory" );
320- as_usm_memory = std ::shared_ptr < py ::object > (
318+ as_usm_memory_ = std ::shared_ptr < py ::object > (
321319 new py ::object {py_as_usm_memory }, Deleter {});
322320
323321 auto mem_kl = mod_memory .attr ("MemoryUSMHost" );
324322 py ::object py_default_usm_memory =
325323 mem_kl (1 , py ::arg ("queue" ) = py_sycl_queue );
326- default_usm_memory = std ::shared_ptr < py ::object > (
324+ default_usm_memory_ = std ::shared_ptr < py ::object > (
327325 new py ::object {py_default_usm_memory }, Deleter {});
328326
329327 py ::module_ mod_usmarray =
@@ -334,7 +332,7 @@ struct dpctl_capi
334332 tensor_kl (py ::tuple (), py ::arg ("dtype" ) = py ::str ("u1" ),
335333 py ::arg ("buffer" ) = py_default_usm_memory );
336334
337- default_usm_ndarray = std ::shared_ptr < py ::object > (
335+ default_usm_ndarray_ = std ::shared_ptr < py ::object > (
338336 new py ::object {py_default_usm_ndarray }, Deleter {});
339337 }
340338
0 commit comments