Skip to content

Commit c3427b3

Browse files
Merge pull request #1359 from IntelPython/remove-DPCTLDevice_GetMaxWorkItemSizes
Removes deprecated DPCTLDevice_GetMaxWorkItemSizes
2 parents 4cc552f + bcefda7 commit c3427b3

File tree

3 files changed

+16
-29
lines changed

3 files changed

+16
-29
lines changed

libsyclinterface/include/dpctl_sycl_device_interface.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,6 @@ DPCTL_API
233233
__dpctl_keep size_t *
234234
DPCTLDevice_GetMaxWorkItemSizes3d(__dpctl_keep const DPCTLSyclDeviceRef DRef);
235235

236-
/*!
237-
* @brief Wrapper for deprecated get_info<info::device::max_work_item_sizes>().
238-
*
239-
* @param DRef Opaque pointer to a ``sycl::device``
240-
* @return Returns the valid result if device exists else returns NULL.
241-
* @ingroup DeviceInterface
242-
*/
243-
#if __cplusplus || (defined(__GNUC__) && __GNUC__ > 10)
244-
[[deprecated("Use DPCTLDevice_WorkItemSizes3d instead")]]
245-
#endif
246-
DPCTL_API __dpctl_keep size_t *
247-
DPCTLDevice_GetMaxWorkItemSizes(__dpctl_keep const DPCTLSyclDeviceRef DRef);
248-
249236
/*!
250237
* @brief Wrapper for get_info<info::device::max_work_group_size>().
251238
*

libsyclinterface/source/dpctl_sycl_device_interface.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,6 @@ DPCTLDevice_GetMaxWorkItemSizes3d(__dpctl_keep const DPCTLSyclDeviceRef DRef)
266266
return DPCTLDevice__GetMaxWorkItemSizes<3>(DRef);
267267
}
268268

269-
__dpctl_keep size_t *
270-
DPCTLDevice_GetMaxWorkItemSizes(__dpctl_keep const DPCTLSyclDeviceRef DRef)
271-
{
272-
return DPCTLDevice__GetMaxWorkItemSizes<3>(DRef);
273-
}
274-
275269
size_t
276270
DPCTLDevice_GetMaxWorkGroupSize(__dpctl_keep const DPCTLSyclDeviceRef DRef)
277271
{

libsyclinterface/tests/test_sycl_device_interface.cpp

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,6 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkItemSizes3d)
175175
EXPECT_NO_FATAL_FAILURE(DPCTLSize_t_Array_Delete(sizes));
176176
}
177177

178-
TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkItemSizes)
179-
{
180-
size_t *sizes = nullptr;
181-
EXPECT_NO_FATAL_FAILURE(sizes = DPCTLDevice_GetMaxWorkItemSizes(DRef));
182-
EXPECT_TRUE(sizes != nullptr);
183-
EXPECT_NO_FATAL_FAILURE(DPCTLSize_t_Array_Delete(sizes));
184-
}
185-
186178
TEST_P(TestDPCTLSyclDeviceInterface, ChkGetMaxWorkGroupSize)
187179
{
188180
size_t n = 0;
@@ -625,10 +617,24 @@ TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemDims)
625617
ASSERT_TRUE(md == 0);
626618
}
627619

628-
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes)
620+
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes1d)
621+
{
622+
size_t *sz = nullptr;
623+
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes1d(Null_DRef));
624+
ASSERT_TRUE(sz == nullptr);
625+
}
626+
627+
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes2d)
628+
{
629+
size_t *sz = nullptr;
630+
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes2d(Null_DRef));
631+
ASSERT_TRUE(sz == nullptr);
632+
}
633+
634+
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxWorkItemSizes3d)
629635
{
630636
size_t *sz = nullptr;
631-
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes(Null_DRef));
637+
EXPECT_NO_FATAL_FAILURE(sz = DPCTLDevice_GetMaxWorkItemSizes3d(Null_DRef));
632638
ASSERT_TRUE(sz == nullptr);
633639
}
634640

0 commit comments

Comments
 (0)