From 571834ca33d52bae10a1a550c181d9656c36a2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Chor=C4=85=C5=BCewicz?= <igor.chorazewicz@intel.com>
Date: Wed, 14 Feb 2024 05:13:33 -0800
Subject: [PATCH] [UR] Remove UMF sources and use standalone UMF repo instead
 (#12570)

https://github.com/oneapi-src/unified-runtime/pull/1216

---------

Co-authored-by: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
---
 sycl/plugins/cuda/CMakeLists.txt            |  2 +-
 sycl/plugins/hip/CMakeLists.txt             |  2 +-
 sycl/plugins/level_zero/CMakeLists.txt      |  2 +-
 sycl/plugins/unified_runtime/CMakeLists.txt | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sycl/plugins/cuda/CMakeLists.txt b/sycl/plugins/cuda/CMakeLists.txt
index 4822a5acf438d..d7b1c76792c27 100644
--- a/sycl/plugins/cuda/CMakeLists.txt
+++ b/sycl/plugins/cuda/CMakeLists.txt
@@ -51,7 +51,7 @@ add_sycl_plugin(cuda
     ${XPTI_LIBS}
     UnifiedRuntime-Headers
     UnifiedRuntimeCommon
-    UnifiedMallocFramework
+    UnifiedMemoryFramework
   HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/features.hpp"
 )
 
diff --git a/sycl/plugins/hip/CMakeLists.txt b/sycl/plugins/hip/CMakeLists.txt
index 5d5e8e4782066..b84b7091ff213 100644
--- a/sycl/plugins/hip/CMakeLists.txt
+++ b/sycl/plugins/hip/CMakeLists.txt
@@ -125,7 +125,7 @@ add_sycl_plugin(hip
   LIBRARIES
     UnifiedRuntime-Headers
     UnifiedRuntimeCommon
-    UnifiedMallocFramework
+    UnifiedMemoryFramework
   HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/include/features.hpp
 )
diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
index 3c41fe7953c14..26cdbfa15fa2a 100644
--- a/sycl/plugins/level_zero/CMakeLists.txt
+++ b/sycl/plugins/level_zero/CMakeLists.txt
@@ -93,7 +93,7 @@ add_sycl_plugin(level_zero
     LevelZeroLoader-Headers
     UnifiedRuntime-Headers
     UnifiedRuntimeCommon
-    UnifiedMallocFramework
+    UnifiedMemoryFramework
     LevelZeroLoader
     Threads::Threads
     ${XPTI_LIBS}
diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
index 596055278ac99..530eec8dbe2c8 100644
--- a/sycl/plugins/unified_runtime/CMakeLists.txt
+++ b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -57,13 +57,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
   include(FetchContent)
 
   set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  # commit 8ff738f424de6f84fa16c9f7d41c8c70b766665d
-  # Merge: 5e548c5e fbdaf72a
+  # commit cfba9f160528018055881f1ccf9ab98ec59c963f
+  # Merge: 0bb2cad8 db5c33b2
   # Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
-  # Date:   Tue Feb 13 13:01:03 2024 +0100
-  #     Merge pull request #1089 from Bensuo/ewan/update
-  #     [EXP][Command-Buffer] Add kernel command update
-  set(UNIFIED_RUNTIME_TAG 8ff738f424de6f84fa16c9f7d41c8c70b766665d)
+  # Date:   Wed Feb 14 11:17:21 2024 +0100
+  #     Merge pull request #1216 from igchor/umf_standalone
+  #     [UR] Remove UMF sources and use standalone UMF repo instead
+  set(UNIFIED_RUNTIME_TAG cfba9f160528018055881f1ccf9ab98ec59c963f)
 
   if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
     set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")
@@ -124,7 +124,7 @@ set(UNIFIED_RUNTIME_COMMON_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/source/com
 
 add_library(UnifiedRuntimeLoader ALIAS ur_loader)
 add_library(UnifiedRuntimeCommon ALIAS ur_common)
-add_library(UnifiedMallocFramework ALIAS unified_malloc_framework)
+add_library(UnifiedMemoryFramework ALIAS umf)
 
 add_library(UnifiedRuntime-Headers INTERFACE)