31
31
#include " dpnp_utils.hpp"
32
32
#include " queue_sycl.hpp"
33
33
34
- #if defined(DPNP_LOCAL_QUEUE)
35
34
sycl::queue *backend_sycl::queue = nullptr ;
36
- #endif
37
35
mkl_rng::mt19937 *backend_sycl::rng_engine = nullptr ;
38
36
mkl_rng::mcg59 *backend_sycl::rng_mcg59_engine = nullptr ;
39
37
@@ -61,7 +59,7 @@ static void dpnpc_show_mathlib_version()
61
59
#endif
62
60
}
63
61
64
- #if (not defined(NDEBUG)) && defined(DPNP_LOCAL_QUEUE)
62
+ #if (not defined(NDEBUG))
65
63
static void show_available_sycl_devices ()
66
64
{
67
65
const std::vector<sycl::device> devices = sycl::device::get_devices ();
@@ -86,24 +84,22 @@ static void show_available_sycl_devices()
86
84
}
87
85
#endif
88
86
89
- #if defined(DPNP_LOCAL_QUEUE)
90
87
static sycl::device get_default_sycl_device ()
91
88
{
92
89
int dpnpc_queue_gpu = 0 ;
93
- sycl::device dev = sycl::device (sycl::cpu_selector () );
90
+ sycl::device dev = sycl::device (sycl::cpu_selector_v );
94
91
95
92
const char *dpnpc_queue_gpu_var = getenv (" DPNPC_QUEUE_GPU" );
96
93
if (dpnpc_queue_gpu_var != NULL ) {
97
94
dpnpc_queue_gpu = atoi (dpnpc_queue_gpu_var);
98
95
}
99
96
100
97
if (dpnpc_queue_gpu) {
101
- dev = sycl::device (sycl::gpu_selector () );
98
+ dev = sycl::device (sycl::gpu_selector_v );
102
99
}
103
100
104
101
return dev;
105
102
}
106
- #endif
107
103
108
104
#if defined(DPNPC_TOUCH_KERNEL_TO_LINK)
109
105
/* *
@@ -135,7 +131,6 @@ static long dpnp_kernels_link()
135
131
}
136
132
#endif
137
133
138
- #if defined(DPNP_LOCAL_QUEUE)
139
134
// Catch asynchronous exceptions
140
135
static void exception_handler (sycl::exception_list exceptions)
141
136
{
@@ -148,11 +143,9 @@ static void exception_handler(sycl::exception_list exceptions)
148
143
}
149
144
}
150
145
};
151
- #endif
152
146
153
147
void backend_sycl::backend_sycl_queue_init (QueueOptions selector)
154
148
{
155
- #if defined(DPNP_LOCAL_QUEUE)
156
149
std::chrono::high_resolution_clock::time_point t1 =
157
150
std::chrono::high_resolution_clock::now ();
158
151
@@ -167,10 +160,10 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
167
160
#endif
168
161
169
162
if (QueueOptions::CPU_SELECTOR == selector) {
170
- dev = sycl::device (sycl::cpu_selector () );
163
+ dev = sycl::device (sycl::cpu_selector_v );
171
164
}
172
165
else if (QueueOptions::GPU_SELECTOR == selector) {
173
- dev = sycl::device (sycl::gpu_selector () );
166
+ dev = sycl::device (sycl::gpu_selector_v );
174
167
}
175
168
else {
176
169
dev = get_default_sycl_device ();
@@ -189,9 +182,6 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
189
182
std::chrono::high_resolution_clock::now ();
190
183
std::chrono::duration<double > time_queue_init =
191
184
std::chrono::duration_cast<std::chrono::duration<double >>(t2 - t1);
192
- #else
193
- (void )selector;
194
- #endif
195
185
196
186
std::chrono::high_resolution_clock::time_point t3 =
197
187
std::chrono::high_resolution_clock::now ();
@@ -207,12 +197,8 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
207
197
std::cout << " Running on: "
208
198
<< DPNP_QUEUE.get_device ().get_info <sycl::info::device::name>()
209
199
<< " \n " ;
210
- #if defined(DPNP_LOCAL_QUEUE)
211
200
std::cout << " queue initialization time: " << time_queue_init.count ()
212
201
<< " (sec.)\n " ;
213
- #else
214
- std::cout << " DPCtrl SYCL queue used\n " ;
215
- #endif
216
202
std::cout << " SYCL kernels link time: " << time_kernels_link.count ()
217
203
<< " (sec.)\n " ;
218
204
dpnpc_show_mathlib_version ();
@@ -222,7 +208,7 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
222
208
223
209
bool backend_sycl::backend_sycl_is_cpu ()
224
210
{
225
- sycl::queue &qptr = get_queue ();
211
+ const sycl::queue &qptr = get_queue ();
226
212
227
213
if (qptr.get_device ().is_cpu ()) {
228
214
return true ;
0 commit comments