Skip to content

Commit 6494938

Browse files
author
Diptorup Deb
committed
Update gtests to not use queue manager
1 parent 1465451 commit 6494938

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "dpctl_sycl_kernel_bundle_interface.h"
3434
#include "dpctl_sycl_kernel_interface.h"
3535
#include "dpctl_sycl_queue_interface.h"
36-
#include "dpctl_sycl_queue_manager.h"
3736
#include <array>
3837
#include <filesystem>
3938
#include <fstream>

libsyclinterface/tests/test_sycl_kernel_interface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "dpctl_sycl_kernel_bundle_interface.h"
3232
#include "dpctl_sycl_kernel_interface.h"
3333
#include "dpctl_sycl_queue_interface.h"
34-
#include "dpctl_sycl_queue_manager.h"
3534
#include "dpctl_utils.h"
3635
#include <array>
3736
#include <gtest/gtest.h>

libsyclinterface/tests/test_sycl_queue_interface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "dpctl_sycl_device_selector_interface.h"
3232
#include "dpctl_sycl_event_interface.h"
3333
#include "dpctl_sycl_queue_interface.h"
34-
#include "dpctl_sycl_queue_manager.h"
3534
#include "dpctl_sycl_type_casters.hpp"
3635
#include "dpctl_sycl_usm_interface.h"
3736
#include <gtest/gtest.h>

libsyclinterface/tests/test_sycl_usm_interface.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "dpctl_sycl_device_selector_interface.h"
3030
#include "dpctl_sycl_event_interface.h"
3131
#include "dpctl_sycl_queue_interface.h"
32-
#include "dpctl_sycl_queue_manager.h"
3332
#include "dpctl_sycl_type_casters.hpp"
3433
#include "dpctl_sycl_usm_interface.h"
3534
#include <cstring>
@@ -95,67 +94,68 @@ struct TestDPCTLSyclUSMInterface : public ::testing::Test
9594

9695
TEST_F(TestDPCTLSyclUSMInterface, MallocShared)
9796
{
98-
auto Q = DPCTLQueueMgr_GetCurrentQueue();
97+
sycl::queue q;
98+
DPCTLSyclQueueRef Q = wrap<queue>(&q);
9999
ASSERT_TRUE(Q);
100100
const size_t nbytes = SIZE;
101101
auto Ptr = DPCTLmalloc_shared(nbytes, Q);
102102
EXPECT_TRUE(bool(Ptr));
103103
common_test_body(nbytes, Ptr, Q, DPCTLSyclUSMType::DPCTL_USM_SHARED);
104104
DPCTLfree_with_queue(Ptr, Q);
105-
DPCTLQueue_Delete(Q);
106105
}
107106

108107
TEST_F(TestDPCTLSyclUSMInterface, MallocDevice)
109108
{
110-
auto Q = DPCTLQueueMgr_GetCurrentQueue();
109+
sycl::queue q;
110+
DPCTLSyclQueueRef Q = wrap<queue>(&q);
111111
ASSERT_TRUE(Q);
112112
const size_t nbytes = SIZE;
113113
auto Ptr = DPCTLmalloc_device(nbytes, Q);
114114
EXPECT_TRUE(bool(Ptr));
115115
common_test_body(nbytes, Ptr, Q, DPCTLSyclUSMType::DPCTL_USM_DEVICE);
116116
DPCTLfree_with_queue(Ptr, Q);
117-
DPCTLQueue_Delete(Q);
118117
}
119118

120119
TEST_F(TestDPCTLSyclUSMInterface, MallocHost)
121120
{
122-
auto Q = DPCTLQueueMgr_GetCurrentQueue();
121+
sycl::queue q;
122+
DPCTLSyclQueueRef Q = wrap<queue>(&q);
123123
ASSERT_TRUE(Q);
124124
const size_t nbytes = SIZE;
125125
auto Ptr = DPCTLmalloc_host(nbytes, Q);
126126
EXPECT_TRUE(bool(Ptr));
127127
common_test_body(nbytes, Ptr, Q, DPCTLSyclUSMType::DPCTL_USM_HOST);
128128
DPCTLfree_with_queue(Ptr, Q);
129-
DPCTLQueue_Delete(Q);
130129
}
131130

132131
TEST_F(TestDPCTLSyclUSMInterface, AlignedAllocShared)
133132
{
134-
auto Q = DPCTLQueueMgr_GetCurrentQueue();
133+
sycl::queue q;
134+
DPCTLSyclQueueRef Q = wrap<queue>(&q);
135135
ASSERT_TRUE(Q);
136136
const size_t nbytes = SIZE;
137137
auto Ptr = DPCTLaligned_alloc_shared(64, nbytes, Q);
138138
EXPECT_TRUE(bool(Ptr));
139139
common_test_body(nbytes, Ptr, Q, DPCTLSyclUSMType::DPCTL_USM_SHARED);
140140
DPCTLfree_with_queue(Ptr, Q);
141-
DPCTLQueue_Delete(Q);
142141
}
143142

144143
TEST_F(TestDPCTLSyclUSMInterface, AlignedAllocDevice)
145144
{
146-
auto Q = DPCTLQueueMgr_GetCurrentQueue();
145+
sycl::queue q;
146+
DPCTLSyclQueueRef Q = wrap<queue>(&q);
147147
ASSERT_TRUE(Q);
148148
const size_t nbytes = SIZE;
149149
auto Ptr = DPCTLaligned_alloc_device(64, nbytes, Q);
150150
EXPECT_TRUE(bool(Ptr));
151151
common_test_body(nbytes, Ptr, Q, DPCTLSyclUSMType::DPCTL_USM_DEVICE);
152152
DPCTLfree_with_queue(Ptr, Q);
153-
DPCTLQueue_Delete(Q);
154153
}
155154

156155
TEST_F(TestDPCTLSyclUSMInterface, AlignedAllocHost)
157156
{
158-
auto Q = DPCTLQueueMgr_GetCurrentQueue();
157+
sycl::queue q;
158+
DPCTLSyclQueueRef Q = wrap<queue>(&q);
159159
ASSERT_TRUE(Q);
160160
const size_t nbytes = SIZE;
161161
auto Ptr = DPCTLaligned_alloc_host(64, nbytes, Q);

0 commit comments

Comments
 (0)