Skip to content

Commit 516690d

Browse files
Remove use of deprecated DPCTLQueueMgr_* functions
This is done by reverting to DPNP_LOCAL_QUEUE=1 behavior. The ultimate goal is to get rid of DPNP_QUEUE throughout dpnp codebase
1 parent e1486cd commit 516690d

File tree

2 files changed

+7
-53
lines changed

2 files changed

+7
-53
lines changed

dpnp/backend/src/queue_sycl.cpp

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
#include "dpnp_utils.hpp"
3232
#include "queue_sycl.hpp"
3333

34-
#if defined(DPNP_LOCAL_QUEUE)
3534
sycl::queue *backend_sycl::queue = nullptr;
36-
#endif
3735
mkl_rng::mt19937 *backend_sycl::rng_engine = nullptr;
3836
mkl_rng::mcg59 *backend_sycl::rng_mcg59_engine = nullptr;
3937

@@ -61,7 +59,7 @@ static void dpnpc_show_mathlib_version()
6159
#endif
6260
}
6361

64-
#if (not defined(NDEBUG)) && defined(DPNP_LOCAL_QUEUE)
62+
#if (not defined(NDEBUG))
6563
static void show_available_sycl_devices()
6664
{
6765
const std::vector<sycl::device> devices = sycl::device::get_devices();
@@ -86,24 +84,22 @@ static void show_available_sycl_devices()
8684
}
8785
#endif
8886

89-
#if defined(DPNP_LOCAL_QUEUE)
9087
static sycl::device get_default_sycl_device()
9188
{
9289
int dpnpc_queue_gpu = 0;
93-
sycl::device dev = sycl::device(sycl::cpu_selector());
90+
sycl::device dev = sycl::device(sycl::cpu_selector_v);
9491

9592
const char *dpnpc_queue_gpu_var = getenv("DPNPC_QUEUE_GPU");
9693
if (dpnpc_queue_gpu_var != NULL) {
9794
dpnpc_queue_gpu = atoi(dpnpc_queue_gpu_var);
9895
}
9996

10097
if (dpnpc_queue_gpu) {
101-
dev = sycl::device(sycl::gpu_selector());
98+
dev = sycl::device(sycl::gpu_selector_v);
10299
}
103100

104101
return dev;
105102
}
106-
#endif
107103

108104
#if defined(DPNPC_TOUCH_KERNEL_TO_LINK)
109105
/**
@@ -135,7 +131,6 @@ static long dpnp_kernels_link()
135131
}
136132
#endif
137133

138-
#if defined(DPNP_LOCAL_QUEUE)
139134
// Catch asynchronous exceptions
140135
static void exception_handler(sycl::exception_list exceptions)
141136
{
@@ -148,11 +143,9 @@ static void exception_handler(sycl::exception_list exceptions)
148143
}
149144
}
150145
};
151-
#endif
152146

153147
void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
154148
{
155-
#if defined(DPNP_LOCAL_QUEUE)
156149
std::chrono::high_resolution_clock::time_point t1 =
157150
std::chrono::high_resolution_clock::now();
158151

@@ -167,10 +160,10 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
167160
#endif
168161

169162
if (QueueOptions::CPU_SELECTOR == selector) {
170-
dev = sycl::device(sycl::cpu_selector());
163+
dev = sycl::device(sycl::cpu_selector_v);
171164
}
172165
else if (QueueOptions::GPU_SELECTOR == selector) {
173-
dev = sycl::device(sycl::gpu_selector());
166+
dev = sycl::device(sycl::gpu_selector_v);
174167
}
175168
else {
176169
dev = get_default_sycl_device();
@@ -189,9 +182,6 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
189182
std::chrono::high_resolution_clock::now();
190183
std::chrono::duration<double> time_queue_init =
191184
std::chrono::duration_cast<std::chrono::duration<double>>(t2 - t1);
192-
#else
193-
(void)selector;
194-
#endif
195185

196186
std::chrono::high_resolution_clock::time_point t3 =
197187
std::chrono::high_resolution_clock::now();
@@ -207,12 +197,8 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
207197
std::cout << "Running on: "
208198
<< DPNP_QUEUE.get_device().get_info<sycl::info::device::name>()
209199
<< "\n";
210-
#if defined(DPNP_LOCAL_QUEUE)
211200
std::cout << "queue initialization time: " << time_queue_init.count()
212201
<< " (sec.)\n";
213-
#else
214-
std::cout << "DPCtrl SYCL queue used\n";
215-
#endif
216202
std::cout << "SYCL kernels link time: " << time_kernels_link.count()
217203
<< " (sec.)\n";
218204
dpnpc_show_mathlib_version();
@@ -222,7 +208,7 @@ void backend_sycl::backend_sycl_queue_init(QueueOptions selector)
222208

223209
bool backend_sycl::backend_sycl_is_cpu()
224210
{
225-
sycl::queue &qptr = get_queue();
211+
const sycl::queue &qptr = get_queue();
226212

227213
if (qptr.get_device().is_cpu()) {
228214
return true;

dpnp/backend/src/queue_sycl.hpp

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@
4040

4141
#include <ctime>
4242

43-
#if !defined(DPNP_LOCAL_QUEUE)
44-
#if defined __has_include
45-
#if __has_include(<dpctl_sycl_interface.h>)
46-
#include <dpctl_sycl_interface.h>
47-
#else
48-
#include <dpctl_sycl_queue_manager.h>
49-
#endif
50-
#endif
51-
#endif
52-
5343
#include "dpnp_pstl.hpp" // this header must be included after <mkl.hpp>
5444

5545
#include "verbose.hpp"
@@ -69,10 +59,8 @@ namespace mkl_rng = oneapi::mkl::rng;
6959
*/
7060
class backend_sycl
7161
{
72-
#if defined(DPNP_LOCAL_QUEUE)
7362
static sycl::queue *queue; /**< contains SYCL queue pointer initialized in
7463
@ref backend_sycl_queue_init */
75-
#endif
7664
static mkl_rng::mt19937
7765
*rng_engine; /**< RNG MT19937 engine ptr. initialized in @ref
7866
backend_sycl_rng_engine_init */
@@ -83,10 +71,7 @@ class backend_sycl
8371
static void destroy()
8472
{
8573
backend_sycl::destroy_rng_engine();
86-
#if defined(DPNP_LOCAL_QUEUE)
8774
delete queue;
88-
queue = nullptr;
89-
#endif
9075
}
9176

9277
static void destroy_rng_engine()
@@ -101,10 +86,9 @@ class backend_sycl
10186
public:
10287
backend_sycl()
10388
{
104-
#if defined(DPNP_LOCAL_QUEUE)
10589
queue = nullptr;
10690
rng_engine = nullptr;
107-
#endif
91+
rng_mcg59_engine = nullptr;
10892
}
10993

11094
virtual ~backend_sycl()
@@ -139,27 +123,11 @@ class backend_sycl
139123
*/
140124
static sycl::queue &get_queue()
141125
{
142-
#if defined(DPNP_LOCAL_QUEUE)
143126
if (!queue) {
144127
backend_sycl_queue_init();
145128
}
146129

147130
return *queue;
148-
#else
149-
// temporal solution. Started from Sept-2020
150-
DPCTLSyclQueueRef DPCtrl_queue = DPCTLQueueMgr_GetCurrentQueue();
151-
if (DPCtrl_queue == nullptr) {
152-
std::string reason =
153-
(DPCTLQueueMgr_GetQueueStackSize() == static_cast<size_t>(-1))
154-
? ": the queue stack is empty, probably no device is "
155-
"available."
156-
: ".";
157-
throw std::runtime_error(
158-
"Failed to create a copy of SYCL queue with default device" +
159-
reason);
160-
}
161-
return *(reinterpret_cast<sycl::queue *>(DPCtrl_queue));
162-
#endif
163131
}
164132

165133
/**

0 commit comments

Comments
 (0)