Fix compilation

Author: hdelan

source/adapters/cuda/usm.cpp

@@ -379,9 +379,6 @@ ur_result_t USMHostMemoryProvider::allocateImpl(void **ResultPtr, size_t Size,
 ur_usm_pool_handle_t_::ur_usm_pool_handle_t_(ur_context_handle_t Context,
                                              ur_usm_pool_desc_t *PoolDesc)
     : Context{Context} {
-  if (PoolDesc->flags & UR_USM_POOL_FLAG_USE_NATIVE_MEMORY_POOL_EXP) {
-    // TODO: this should only use the host
-  }
   const void *pNext = PoolDesc->pNext;
   while (pNext != nullptr) {
     const ur_base_desc_t *BaseDesc = static_cast<const ur_base_desc_t *>(pNext);
@@ -436,62 +433,13 @@ ur_usm_pool_handle_t_::ur_usm_pool_handle_t_(ur_context_handle_t Context,
 ur_usm_pool_handle_t_::ur_usm_pool_handle_t_(ur_context_handle_t Context,
                                              ur_device_handle_t Device,
                                              ur_usm_pool_desc_t *PoolDesc)
-    : Context{Context} {
-  if (PoolDesc->flags & UR_USM_POOL_FLAG_USE_NATIVE_MEMORY_POOL_EXP) {
-    // TODO: this should only use the host
-  }
-  const void *pNext = PoolDesc->pNext;
-  while (pNext != nullptr) {
-    const ur_base_desc_t *BaseDesc = static_cast<const ur_base_desc_t *>(pNext);
-    switch (BaseDesc->stype) {
-    case UR_STRUCTURE_TYPE_USM_POOL_LIMITS_DESC: {
-      const ur_usm_pool_limits_desc_t *Limits =
-          reinterpret_cast<const ur_usm_pool_limits_desc_t *>(BaseDesc);
-      for (auto &config : DisjointPoolConfigs.Configs) {
-        config.MaxPoolableSize = Limits->maxPoolableSize;
-        config.SlabMinSize = Limits->minDriverAllocSize;
-      }
-      break;
-    }
-    default: {
-      throw UsmAllocationException(UR_RESULT_ERROR_INVALID_ARGUMENT);
-    }
-    }
-    pNext = BaseDesc->pNext;
-  }
-
-  auto MemProvider =
-      umf::memoryProviderMakeUnique<USMHostMemoryProvider>(Context, nullptr)
-          .second;
-
-  auto UmfHostParamsHandle = getUmfParamsHandle(
-      DisjointPoolConfigs.Configs[usm::DisjointPoolMemType::Host]);
-  HostMemPool =
-      umf::poolMakeUniqueFromOps(umfDisjointPoolOps(), std::move(MemProvider),
-                                 UmfHostParamsHandle.get())
-          .second;
+    : Context{Context}, Device{Device} {
+  if (!(PoolDesc->flags & UR_USM_POOL_FLAG_USE_NATIVE_MEMORY_POOL_EXP))
+    throw;
 
-  for (const auto &Device : Context->getDevices()) {
-    MemProvider =
-        umf::memoryProviderMakeUnique<USMDeviceMemoryProvider>(Context, Device)
-            .second;
-    auto UmfDeviceParamsHandle = getUmfParamsHandle(
-        DisjointPoolConfigs.Configs[usm::DisjointPoolMemType::Device]);
-    DeviceMemPool =
-        umf::poolMakeUniqueFromOps(umfDisjointPoolOps(), std::move(MemProvider),
-                                   UmfDeviceParamsHandle.get())
-            .second;
-    MemProvider =
-        umf::memoryProviderMakeUnique<USMSharedMemoryProvider>(Context, Device)
-            .second;
-    auto UmfSharedParamsHandle = getUmfParamsHandle(
-        DisjointPoolConfigs.Configs[usm::DisjointPoolMemType::Shared]);
-    SharedMemPool =
-        umf::poolMakeUniqueFromOps(umfDisjointPoolOps(), std::move(MemProvider),
-                                   UmfSharedParamsHandle.get())
-            .second;
-    Context->addPool(this);
-  }
+  // TODO: what flags should be used here. Moreover what flags should have
+  // UR counterparts?
+  UR_CHECK_ERROR(cuMemPoolCreate(&CUmemPool, 0));
 }
 
 bool ur_usm_pool_handle_t_::hasUMFPool(umf_memory_pool_t *umf_pool) {

source/adapters/cuda/usm.hpp

@@ -21,6 +21,7 @@ struct ur_usm_pool_handle_t_ {
   std::atomic_uint32_t RefCount = 1;
 
   ur_context_handle_t Context = nullptr;
+  ur_device_handle_t Device = nullptr;
 
   usm::DisjointPoolAllConfigs DisjointPoolConfigs =
       usm::DisjointPoolAllConfigs();
@@ -34,6 +35,10 @@ struct ur_usm_pool_handle_t_ {
   ur_usm_pool_handle_t_(ur_context_handle_t Context,
                         ur_usm_pool_desc_t *PoolDesc);
 
+  // TODO: do we need the context param?
+  ur_usm_pool_handle_t_(ur_context_handle_t Context, ur_device_handle_t Device,
+                        ur_usm_pool_desc_t *PoolDesc);
+
   uint32_t incrementReferenceCount() noexcept { return ++RefCount; }
 
   uint32_t decrementReferenceCount() noexcept { return --RefCount; }