Skip to content

Commit 6c5d2de

Browse files
authored
Merge pull request #2353 from IntelPython/remove-deprecated-device-info-query
Remove `sub_group_independent_forward_progress` device info query
2 parents a19fbc5 + 4281cb4 commit 6c5d2de

6 files changed

Lines changed: 0 additions & 75 deletions

File tree

dpctl/_backend.pxd

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@ cdef extern from "syclinterface/dpctl_sycl_device_interface.h":
234234
cdef bool DPCTLDevice_IsAccelerator(const DPCTLSyclDeviceRef DRef)
235235
cdef bool DPCTLDevice_IsCPU(const DPCTLSyclDeviceRef DRef)
236236
cdef bool DPCTLDevice_IsGPU(const DPCTLSyclDeviceRef DRef)
237-
cdef bool DPCTLDevice_GetSubGroupIndependentForwardProgress(
238-
const DPCTLSyclDeviceRef DRef
239-
)
240237
cdef uint32_t DPCTLDevice_GetPreferredVectorWidthChar(
241238
const DPCTLSyclDeviceRef DRef
242239
)

dpctl/_sycl_device.pyx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ from ._backend cimport ( # noqa: E211
9999
DPCTLDevice_GetPreferredVectorWidthShort,
100100
DPCTLDevice_GetProfilingTimerResolution,
101101
DPCTLDevice_GetSingleFPConfig,
102-
DPCTLDevice_GetSubGroupIndependentForwardProgress,
103102
DPCTLDevice_GetSubGroupSizes,
104103
DPCTLDevice_GetVendor,
105104
DPCTLDevice_GetVendorId,
@@ -1246,20 +1245,6 @@ cdef class SyclDevice(_SyclDevice):
12461245
)
12471246
return max_num_sub_groups
12481247

1249-
@property
1250-
def sub_group_independent_forward_progress(self):
1251-
""" Returns ``True`` if the device supports independent forward progress
1252-
of sub-groups with respect to other sub-groups in the same work-group.
1253-
1254-
Returns:
1255-
bool:
1256-
Indicates if the device supports independent forward progress
1257-
of sub-groups.
1258-
"""
1259-
return DPCTLDevice_GetSubGroupIndependentForwardProgress(
1260-
self._device_ref
1261-
)
1262-
12631248
@property
12641249
def sub_group_sizes(self):
12651250
""" Returns tuple of supported sub-group sizes for this device.

dpctl/tests/_device_attributes_checks.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,6 @@ def check_image_3d_max_depth(device):
322322
pytest.fail("image_3d_max_depth call failed")
323323

324324

325-
def check_sub_group_independent_forward_progress(device):
326-
try:
327-
device.sub_group_independent_forward_progress
328-
except Exception:
329-
pytest.fail("sub_group_independent_forward_progress call failed")
330-
331-
332325
def check_preferred_vector_width_char(device):
333326
try:
334327
device.preferred_vector_width_char
@@ -812,7 +805,6 @@ def check_partition_affinity_domains(device):
812805
check_is_accelerator,
813806
check_is_cpu,
814807
check_is_gpu,
815-
check_sub_group_independent_forward_progress,
816808
check_preferred_vector_width_char,
817809
check_preferred_vector_width_short,
818810
check_preferred_vector_width_int,

libsyclinterface/include/syclinterface/dpctl_sycl_device_interface.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -458,18 +458,6 @@ DPCTL_API
458458
__dpctl_give DPCTLDeviceVectorRef DPCTLDevice_CreateSubDevicesByAffinity(
459459
__dpctl_keep const DPCTLSyclDeviceRef DRef,
460460
DPCTLPartitionAffinityDomainType PartAffDomTy);
461-
/*!
462-
* @brief Wrapper over
463-
* device.get_info<info::device::sub_group_independent_forward_progress>.
464-
*
465-
* @param DRef Opaque pointer to a ``sycl::device``
466-
* @return Returns true if the device supports independent forward progress of
467-
* sub-groups with respect to other sub-groups in the same work-group.
468-
* @ingroup DeviceInterface
469-
*/
470-
DPCTL_API
471-
bool DPCTLDevice_GetSubGroupIndependentForwardProgress(
472-
__dpctl_keep const DPCTLSyclDeviceRef DRef);
473461

474462
/*!
475463
* @brief Wrapper over

libsyclinterface/source/dpctl_sycl_device_interface.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -408,22 +408,6 @@ declmethod(GetImage3dMaxHeight, image3d_max_height, size_t);
408408
declmethod(GetImage3dMaxDepth, image3d_max_depth, size_t);
409409
#undef declmethod
410410

411-
bool DPCTLDevice_GetSubGroupIndependentForwardProgress(
412-
__dpctl_keep const DPCTLSyclDeviceRef DRef)
413-
{
414-
bool SubGroupProgress = false;
415-
auto D = unwrap<device>(DRef);
416-
if (D) {
417-
try {
418-
SubGroupProgress = D->get_info<
419-
info::device::sub_group_independent_forward_progress>();
420-
} catch (std::exception const &e) {
421-
error_handler(e, __FILE__, __func__, __LINE__);
422-
}
423-
}
424-
return SubGroupProgress;
425-
}
426-
427411
namespace
428412
{
429413

libsyclinterface/tests/test_sycl_device_interface.cpp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -233,18 +233,6 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkIsGPU)
233233
EXPECT_NO_FATAL_FAILURE(DPCTLDevice_IsGPU(DRef));
234234
}
235235

236-
TEST_P(TestDPCTLSyclDeviceInterface, ChkGetSubGroupIndependentForwardProgress)
237-
{
238-
bool sub_group_progress = 0;
239-
EXPECT_NO_FATAL_FAILURE(
240-
sub_group_progress =
241-
DPCTLDevice_GetSubGroupIndependentForwardProgress(DRef));
242-
auto D = reinterpret_cast<device *>(DRef);
243-
auto get_sub_group_progress =
244-
D->get_info<info::device::sub_group_independent_forward_progress>();
245-
EXPECT_TRUE(get_sub_group_progress == sub_group_progress);
246-
}
247-
248236
TEST_P(TestDPCTLSyclDeviceInterface, ChkGetPreferredVectorWidthChar)
249237
{
250238
uint32_t vector_width_char = 0;
@@ -1003,15 +991,6 @@ TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetMaxImageDims)
1003991
ASSERT_TRUE(res == 0);
1004992
}
1005993

1006-
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetSubGroupIndependentForwardProgress)
1007-
{
1008-
bool indep_pr = true;
1009-
EXPECT_NO_FATAL_FAILURE(
1010-
indep_pr =
1011-
DPCTLDevice_GetSubGroupIndependentForwardProgress(Null_DRef));
1012-
ASSERT_FALSE(indep_pr);
1013-
}
1014-
1015994
TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetPreferredVectorWidth)
1016995
{
1017996
uint32_t w = -1;

0 commit comments

Comments
 (0)