Updated deprecated declarations with their replacements

The only outstanding deprecation is use of `sycl::program`, but addressing
that would take more work to fix.

Since `sycl::aspect::usm_system_allocator` was deprecated in favor of
`sycl::aspect::usm_system_allocations` in line with other aspects, the
DPCTL enum was renamed accordingly.

Tests were changed. This change is user visible.

Author: oleksandr-pavlyk

dpctl/_backend.pxd

@@ -93,7 +93,7 @@ cdef extern from "syclinterface/dpctl_sycl_enum_types.h":
         _usm_host_allocations               'usm_host_allocations',
         _usm_shared_allocations             'usm_shared_allocations',
         _usm_restricted_shared_allocations  'usm_restricted_shared_allocations',
-        _usm_system_allocator               'usm_system_allocator'
+        _usm_system_allocations             'usm_system_allocations'
 
     ctypedef enum _partition_affinity_domain_type 'DPCTLPartitionAffinityDomainType':
         _not_applicable                     'not_applicable',

dpctl/_sycl_device.pyx

@@ -441,8 +441,8 @@ cdef class SyclDevice(_SyclDevice):
         return DPCTLDevice_HasAspect(self._device_ref, AT)
 
     @property
-    def has_aspect_usm_system_allocator(self):
-        cdef _aspect_type AT = _aspect_type._usm_system_allocator
+    def has_aspect_usm_system_allocations(self):
+        cdef _aspect_type AT = _aspect_type._usm_system_allocations
         return DPCTLDevice_HasAspect(self._device_ref, AT)
 
     @property

dpctl/tests/test_sycl_device.py

@@ -219,11 +219,11 @@ def check_has_aspect_usm_restricted_shared_allocations(device):
         pytest.fail("has_aspect_usm_restricted_shared_allocations call failed")
 
 
-def check_has_aspect_usm_system_allocator(device):
+def check_has_aspect_usm_system_allocations(device):
     try:
-        device.has_aspect_usm_system_allocator
+        device.has_aspect_usm_system_allocations
     except Exception:
-        pytest.fail("has_aspect_usm_system_allocator call failed")
+        pytest.fail("has_aspect_usm_system_allocations call failed")
 
 
 def check_is_accelerator(device):
@@ -520,7 +520,7 @@ def check_repr(device):
     check_has_aspect_usm_host_allocations,
     check_has_aspect_usm_shared_allocations,
     check_has_aspect_usm_restricted_shared_allocations,
-    check_has_aspect_usm_system_allocator,
+    check_has_aspect_usm_system_allocations,
     check_get_max_read_image_args,
     check_get_max_write_image_args,
     check_get_image_2d_max_width,
@@ -679,7 +679,7 @@ def test_hashing_of_device():
     "usm_device_allocations",
     "usm_host_allocations",
     "usm_shared_allocations",
-    "usm_system_allocator",
+    "usm_system_allocations",
 ]
 
 # SYCL 2020 spec aspects not presently

dpctl/tests/test_sycl_queue.py

@@ -211,11 +211,11 @@ def check_has_aspect_usm_restricted_shared_allocations(device):
         pytest.fail("has_aspect_usm_restricted_shared_allocations call failed")
 
 
-def check_has_aspect_usm_system_allocator(device):
+def check_has_aspect_usm_system_allocations(device):
     try:
-        device.has_aspect_usm_system_allocator
+        device.has_aspect_usm_system_allocations
     except Exception:
-        pytest.fail("has_aspect_usm_system_allocator call failed")
+        pytest.fail("has_aspect_usm_system_allocations call failed")
 
 
 def check_is_accelerator(device):
@@ -273,7 +273,7 @@ def check_is_host(device):
     check_has_aspect_usm_host_allocations,
     check_has_aspect_usm_shared_allocations,
     check_has_aspect_usm_restricted_shared_allocations,
-    check_has_aspect_usm_system_allocator,
+    check_has_aspect_usm_system_allocations,
 ]
 
 

libsyclinterface/helper/source/dpctl_error_handlers.cpp

@@ -39,7 +39,7 @@ void DPCTL_AsyncErrorHandler::operator()(
             std::rethrow_exception(e);
         } catch (sycl::exception const &e) {
             error_handler(e, __FILE__, __func__, __LINE__);
-            auto err_code = e.code();
+            auto err_code = e.code().value();
             handler_(static_cast<int>(err_code));
         }
     }

libsyclinterface/tests/test_sycl_device_aspects.cpp

@@ -99,8 +99,8 @@ auto build_params()
                            cl::sycl::aspect::usm_shared_allocations),
             std::make_pair("usm_restricted_shared_allocations",
                            cl::sycl::aspect::usm_restricted_shared_allocations),
-            std::make_pair("usm_system_allocator",
-                           cl::sycl::aspect::usm_system_allocator));
+            std::make_pair("usm_system_allocations",
+                           cl::sycl::aspect::usm_system_allocations));
 
     auto pairs =
         build_param_pairs<const char *,
@@ -141,7 +141,7 @@ struct TestDPCTLSyclDeviceInterfaceAspects
         auto syclAspect = GetParam().second.second;
         try {
             hasAspect = D->has(syclAspect);
-        } catch (cl::sycl::runtime_error const &re) {
+        } catch (sycl::exception const &e) {
         }
     }
 

libsyclinterface/tests/test_sycl_device_subdevices.cpp

@@ -149,7 +149,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityNotApplicable)
                 EXPECT_TRUE(DPCTLDeviceVector_Size(DVRef) == expected_size);
                 EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(DVRef));
             }
-        } catch (runtime_error const &re) {
+        } catch (exception const &e) {
         }
     }
 }