[UR] Bump UMF to v0.12.0-dev2-6 (#18378)

Author: lukaszstolarczuk

unified-runtime/source/adapters/hip/usm.cpp

@@ -322,7 +322,8 @@ void USMMemoryProvider::get_last_native_error(const char **ErrMsg,
   *ErrCode = static_cast<int32_t>(getLastStatusRef());
 }
 
-umf_result_t USMMemoryProvider::get_min_page_size(void *Ptr, size_t *PageSize) {
+umf_result_t USMMemoryProvider::get_min_page_size(const void *Ptr,
+                                                  size_t *PageSize) {
   (void)Ptr;
   *PageSize = MinPageSize;
 

unified-runtime/source/adapters/hip/usm.hpp

@@ -62,7 +62,7 @@ class USMMemoryProvider {
   umf_result_t alloc(size_t Size, size_t Align, void **Ptr);
   umf_result_t free(void *Ptr, size_t Size);
   void get_last_native_error(const char **ErrMsg, int32_t *ErrCode);
-  umf_result_t get_min_page_size(void *, size_t *);
+  umf_result_t get_min_page_size(const void *, size_t *);
   umf_result_t get_recommended_page_size(size_t, size_t *) {
     return UMF_RESULT_ERROR_NOT_SUPPORTED;
   };

unified-runtime/source/adapters/level_zero/usm.cpp

@@ -730,9 +730,10 @@ enum umf_result_t L0MemoryProvider::free(void *Ptr, size_t Size) {
   return UMF_RESULT_SUCCESS;
 }
 
-umf_result_t L0MemoryProvider::GetL0MinPageSize(void *Mem, size_t *PageSize) {
+umf_result_t L0MemoryProvider::GetL0MinPageSize(const void *Mem,
+                                                size_t *PageSize) {
   ur_result_t Res = UR_RESULT_SUCCESS;
-  void *Ptr = Mem;
+  void *Ptr = const_cast<void *>(Mem);
 
   if (!Mem) {
     Res = allocateImpl(&Ptr, 1, 0);
@@ -765,7 +766,8 @@ umf_result_t L0MemoryProvider::GetL0MinPageSize(void *Mem, size_t *PageSize) {
   return UMF_RESULT_ERROR_MEMORY_PROVIDER_SPECIFIC;
 }
 
-umf_result_t L0MemoryProvider::get_min_page_size(void *Ptr, size_t *PageSize) {
+umf_result_t L0MemoryProvider::get_min_page_size(const void *Ptr,
+                                                 size_t *PageSize) {
 
   // Query L0 for min page size. Use provided 'Ptr'.
   if (Ptr) {

unified-runtime/source/adapters/level_zero/usm.hpp

@@ -92,7 +92,7 @@ class USMMemoryProviderBase {
   virtual umf_result_t free(void *, size_t) {
     return UMF_RESULT_ERROR_NOT_SUPPORTED;
   };
-  virtual umf_result_t get_min_page_size(void *, size_t *) {
+  virtual umf_result_t get_min_page_size(const void *, size_t *) {
     return UMF_RESULT_ERROR_NOT_SUPPORTED;
   };
   virtual umf_result_t get_recommended_page_size(size_t, size_t *) {
@@ -133,7 +133,7 @@ class USMMemoryProviderBase {
 class L0MemoryProvider : public USMMemoryProviderBase {
 private:
   // Min page size query function for L0MemoryProvider.
-  umf_result_t GetL0MinPageSize(void *Mem, size_t *PageSize);
+  umf_result_t GetL0MinPageSize(const void *Mem, size_t *PageSize);
   size_t MinPageSize = 0;
   bool MinPageSizeCached = false;
 
@@ -142,7 +142,7 @@ class L0MemoryProvider : public USMMemoryProviderBase {
                           ur_device_handle_t Dev) override;
   umf_result_t alloc(size_t Size, size_t Align, void **Ptr) override;
   umf_result_t free(void *Ptr, size_t Size) override;
-  umf_result_t get_min_page_size(void *, size_t *) override;
+  umf_result_t get_min_page_size(const void *, size_t *) override;
   // TODO: Different name for each provider (Host/Shared/SharedRO/Device)
   const char *get_name() override { return "Level Zero"; };
   umf_result_t get_ipc_handle_size(size_t *) override;

unified-runtime/source/common/CMakeLists.txt

@@ -40,11 +40,12 @@ if (NOT DEFINED UMF_REPO)
 endif()
 
 if (NOT DEFINED UMF_TAG)
-    # commit a5c3d266641c479511dc6a984ea5b71257e8fee9
-    # Author: Łukasz Stolarczuk <lukasz.stolarczuk@intel.com>
-    # Date:   Thu Apr 17 14:13:05 2025 +0200
-    # 0.11.0 release
-    set(UMF_TAG v0.11.0)
+    # commit 0a63bbd489e8e910c3f9a2129b287bfc63925716 (HEAD -> main, upstream/main)
+    # Author: Rafał Rudnicki <rafal.rudnicki@intel.com>
+    # Date:   Mon May 12 09:46:48 2025 +0200
+    # Merge pull request #1308 from lukaszstolarczuk/depr-hwloc-disable-cmake
+    # [CMake] Warn about UMF_DISABLE_HWLOC being deprecated
+    set(UMF_TAG 0a63bbd489e8e910c3f9a2129b287bfc63925716)
 endif()
 
 message(STATUS "Will fetch Unified Memory Framework from ${UMF_REPO}")

unified-runtime/source/common/umf_helpers.hpp

@@ -130,7 +130,7 @@ umf_memory_pool_ops_t poolMakeUniqueOps() {
   umf_memory_pool_ops_t ops = {};
 
   ops.version = UMF_VERSION_CURRENT;
-  ops.initialize = [](umf_memory_provider_handle_t provider, void *params,
+  ops.initialize = [](umf_memory_provider_handle_t provider, const void *params,
                       void **obj) {
     try {
       *obj = new T;
@@ -168,7 +168,7 @@ auto memoryProviderMakeUnique(Args &&...args) {
   auto argsTuple = std::make_tuple(std::forward<Args>(args)...);
 
   ops.version = UMF_VERSION_CURRENT;
-  ops.initialize = [](void *params, void **obj) {
+  ops.initialize = [](const void *params, void **obj) {
     try {
       *obj = new T;
     } catch (...) {
@@ -177,7 +177,7 @@ auto memoryProviderMakeUnique(Args &&...args) {
 
     return detail::initialize<T>(
         reinterpret_cast<T *>(*obj),
-        *reinterpret_cast<decltype(argsTuple) *>(params));
+        *reinterpret_cast<decltype(argsTuple) *>(const_cast<void *>(params)));
   };
   ops.finalize = [](void *obj) { delete reinterpret_cast<T *>(obj); };
 
@@ -222,7 +222,7 @@ auto poolMakeUnique(provider_unique_handle_t provider, Args &&...args) {
       ret, pool_unique_handle_t(hPool, umfPoolDestroy)};
 }
 
-static inline auto poolMakeUniqueFromOps(umf_memory_pool_ops_t *ops,
+static inline auto poolMakeUniqueFromOps(const umf_memory_pool_ops_t *ops,
                                          provider_unique_handle_t provider,
                                          void *params) {
   umf_memory_pool_handle_t hPool;
@@ -240,7 +240,7 @@ static inline auto poolMakeUniqueFromOps(umf_memory_pool_ops_t *ops,
 }
 
 static inline auto
-poolMakeUniqueFromOpsProviderHandle(umf_memory_pool_ops_t *ops,
+poolMakeUniqueFromOpsProviderHandle(const umf_memory_pool_ops_t *ops,
                                     umf_memory_provider_handle_t provider,
                                     void *params) {
   umf_memory_pool_handle_t hPool;
@@ -254,8 +254,9 @@ poolMakeUniqueFromOpsProviderHandle(umf_memory_pool_ops_t *ops,
       UMF_RESULT_SUCCESS, pool_unique_handle_t(hPool, umfPoolDestroy)};
 }
 
-static inline auto providerMakeUniqueFromOps(umf_memory_provider_ops_t *ops,
-                                             void *params) {
+static inline auto
+providerMakeUniqueFromOps(const umf_memory_provider_ops_t *ops,
+                          const void *params) {
   umf_memory_provider_handle_t hProvider;
   auto ret = umfMemoryProviderCreate(ops, params, &hProvider);
   if (ret != UMF_RESULT_SUCCESS) {