[UR] Fix params test

Author: Petr Vesely

include/ur.py

@@ -591,7 +591,6 @@ class ur_device_partition_property_t(c_intptr_t):
 class ur_device_partition_v(IntEnum):
     EQUALLY = 0x1086                                ## Partition Equally
     BY_COUNTS = 0x1087                              ## Partition by counts
-    BY_COUNTS_LIST_END = 0x0                        ## End of by counts list
     BY_AFFINITY_DOMAIN = 0x1088                     ## Partition by affinity domain
     BY_CSLICE = 0x1089                              ## Partition by c-slice
 

include/ur_api.h

@@ -1024,7 +1024,6 @@ typedef intptr_t ur_device_partition_property_t;
 typedef enum ur_device_partition_t {
     UR_DEVICE_PARTITION_EQUALLY = 0x1086,            ///< Partition Equally
     UR_DEVICE_PARTITION_BY_COUNTS = 0x1087,          ///< Partition by counts
-    UR_DEVICE_PARTITION_BY_COUNTS_LIST_END = 0x0,    ///< End of by counts list
     UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN = 0x1088, ///< Partition by affinity domain
     UR_DEVICE_PARTITION_BY_CSLICE = 0x1089,          ///< Partition by c-slice
     /// @cond

scripts/core/device.yml

@@ -493,9 +493,6 @@ etors:
     - name: BY_COUNTS
       desc: "Partition by counts"
       value: "0x1087"
-    - name: BY_COUNTS_LIST_END
-      desc: "End of by counts list"
-      value: "0x0"
     - name: BY_AFFINITY_DOMAIN
       desc: "Partition by affinity domain"
       value: "0x1088"

source/common/ur_params.hpp

@@ -3280,10 +3280,6 @@ inline std::ostream &operator<<(std::ostream &os,
         os << "UR_DEVICE_PARTITION_BY_COUNTS";
         break;
 
-    case UR_DEVICE_PARTITION_BY_COUNTS_LIST_END:
-        os << "UR_DEVICE_PARTITION_BY_COUNTS_LIST_END";
-        break;
-
     case UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN:
         os << "UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN";
         break;

source/common/ur_pool_manager.hpp

@@ -35,26 +35,33 @@ struct pool_descriptor {
 
 static inline std::pair<ur_result_t, std::vector<ur_device_handle_t>>
 urGetSubDevices(ur_device_handle_t hDevice) {
-    size_t nComputeUnits;
+    uint32_t nComputeUnits;
     auto ret = urDeviceGetInfo(hDevice, UR_DEVICE_INFO_MAX_COMPUTE_UNITS,
                                sizeof(nComputeUnits), &nComputeUnits, nullptr);
     if (ret != UR_RESULT_SUCCESS) {
         return {ret, {}};
     }
 
-    ur_device_partition_property_t properties[] = {
-        UR_DEVICE_PARTITION_EQUALLY,
-        static_cast<ur_device_partition_property_t>(nComputeUnits), 0};
+    // ur_device_partition_property_t properties[] = {
+    //     UR_DEVICE_PARTITION_EQUALLY,
+    //     static_cast<ur_device_partition_property_t>(nComputeUnits), 0};
+
+    ur_device_partition_equally_desc_t part_eq_desc{
+        UR_STRUCTURE_TYPE_DEVICE_PARTITION_EQUALLY_DESC, nullptr,
+        nComputeUnits};
+
+    ur_device_partition_desc_t part_desc{
+        UR_STRUCTURE_TYPE_DEVICE_PARTITION_DESC, &part_eq_desc};
 
     // Get the number of devices that will be created
     uint32_t deviceCount;
-    ret = urDevicePartition(hDevice, properties, 0, nullptr, &deviceCount);
+    ret = urDevicePartition(hDevice, &part_desc, 0, nullptr, &deviceCount);
     if (ret != UR_RESULT_SUCCESS) {
         return {ret, {}};
     }
 
     std::vector<ur_device_handle_t> sub_devices(deviceCount);
-    ret = urDevicePartition(hDevice, properties,
+    ret = urDevicePartition(hDevice, &part_desc,
                             static_cast<uint32_t>(sub_devices.size()),
                             sub_devices.data(), nullptr);
     if (ret != UR_RESULT_SUCCESS) {
@@ -135,7 +142,7 @@ inline bool pool_descriptor::equal(const pool_descriptor &lhs,
            (isSharedAllocationReadOnlyOnDevice(lhs) ==
             isSharedAllocationReadOnlyOnDevice(rhs)) &&
            lhs.poolHandle == rhs.poolHandle;
-};
+}
 
 inline std::size_t pool_descriptor::hash(const pool_descriptor &desc) {
     ur_native_handle_t native;
@@ -147,7 +154,7 @@ inline std::size_t pool_descriptor::hash(const pool_descriptor &desc) {
     return combine_hashes(0, desc.type, native,
                           isSharedAllocationReadOnlyOnDevice(desc),
                           desc.poolHandle);
-};
+}
 
 inline std::pair<ur_result_t, std::vector<pool_descriptor>>
 pool_descriptor::create(ur_usm_pool_handle_t poolHandle,

test/unit/utils/params.cpp

@@ -239,9 +239,9 @@ struct UrDeviceGetInfoParamsInvalidSize : UrDeviceGetInfoParams {
 };
 
 struct UrDeviceGetInfoParamsPartitionArray : UrDeviceGetInfoParams {
-    ur_device_partition_property_t props[3] = {
-        UR_DEVICE_PARTITION_BY_COUNTS, UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
-        UR_DEVICE_PARTITION_BY_CSLICE};
+    ur_device_partition_t props[4] = {
+        UR_DEVICE_PARTITION_EQUALLY, UR_DEVICE_PARTITION_BY_COUNTS,
+        UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, UR_DEVICE_PARTITION_BY_CSLICE};
     UrDeviceGetInfoParamsPartitionArray() : UrDeviceGetInfoParams() {
         propName = UR_DEVICE_INFO_PARTITION_PROPERTIES;
         pPropValue = &props;
@@ -251,8 +251,11 @@ struct UrDeviceGetInfoParamsPartitionArray : UrDeviceGetInfoParams {
     const char *get_expected() {
         return ".hDevice = nullptr, .propName = "
                "UR_DEVICE_INFO_PARTITION_PROPERTIES, .propSize "
-               "= 24, .pPropValue = \\[4231, 4232, 4233\\], .pPropSizeRet = .+ "
-               "\\(24\\)";
+               "= 16, .pPropValue = \\[UR_DEVICE_PARTITION_EQUALLY, "
+               "UR_DEVICE_PARTITION_BY_COUNTS, "
+               "UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN, "
+               "UR_DEVICE_PARTITION_BY_CSLICE\\], .pPropSizeRet = .+ "
+               "\\(16\\)";
         // TODO: should resolve type values for ur_device_partition_property_t...
     };
 };