Skip to content

Commit 571834c

Browse files
igchorkbenzie
andauthored
[UR] Remove UMF sources and use standalone UMF repo instead (#12570)
oneapi-src/unified-runtime#1216 --------- Co-authored-by: Kenneth Benzie (Benie) <[email protected]>
1 parent 0178774 commit 571834c

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

sycl/plugins/cuda/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ add_sycl_plugin(cuda
5151
${XPTI_LIBS}
5252
UnifiedRuntime-Headers
5353
UnifiedRuntimeCommon
54-
UnifiedMallocFramework
54+
UnifiedMemoryFramework
5555
HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/features.hpp"
5656
)
5757

sycl/plugins/hip/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ add_sycl_plugin(hip
125125
LIBRARIES
126126
UnifiedRuntime-Headers
127127
UnifiedRuntimeCommon
128-
UnifiedMallocFramework
128+
UnifiedMemoryFramework
129129
HEADER
130130
${CMAKE_CURRENT_SOURCE_DIR}/include/features.hpp
131131
)

sycl/plugins/level_zero/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ add_sycl_plugin(level_zero
9393
LevelZeroLoader-Headers
9494
UnifiedRuntime-Headers
9595
UnifiedRuntimeCommon
96-
UnifiedMallocFramework
96+
UnifiedMemoryFramework
9797
LevelZeroLoader
9898
Threads::Threads
9999
${XPTI_LIBS}

sycl/plugins/unified_runtime/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
5757
include(FetchContent)
5858

5959
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
60-
# commit 8ff738f424de6f84fa16c9f7d41c8c70b766665d
61-
# Merge: 5e548c5e fbdaf72a
60+
# commit cfba9f160528018055881f1ccf9ab98ec59c963f
61+
# Merge: 0bb2cad8 db5c33b2
6262
# Author: Kenneth Benzie (Benie) <[email protected]>
63-
# Date: Tue Feb 13 13:01:03 2024 +0100
64-
# Merge pull request #1089 from Bensuo/ewan/update
65-
# [EXP][Command-Buffer] Add kernel command update
66-
set(UNIFIED_RUNTIME_TAG 8ff738f424de6f84fa16c9f7d41c8c70b766665d)
63+
# Date: Wed Feb 14 11:17:21 2024 +0100
64+
# Merge pull request #1216 from igchor/umf_standalone
65+
# [UR] Remove UMF sources and use standalone UMF repo instead
66+
set(UNIFIED_RUNTIME_TAG cfba9f160528018055881f1ccf9ab98ec59c963f)
6767

6868
if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
6969
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
124124

125125
add_library(UnifiedRuntimeLoader ALIAS ur_loader)
126126
add_library(UnifiedRuntimeCommon ALIAS ur_common)
127-
add_library(UnifiedMallocFramework ALIAS unified_malloc_framework)
127+
add_library(UnifiedMemoryFramework ALIAS umf)
128128

129129
add_library(UnifiedRuntime-Headers INTERFACE)
130130

0 commit comments

Comments
 (0)