Skip to content

Commit 14bafb8

Browse files
committed
[UR][CUDA] Avoid unnecessary calls to cuFuncSetAttribute
Update UR tag to include oneapi-src/unified-runtime#2678
1 parent c812d8b commit 14bafb8

File tree

2 files changed

+7
-21
lines changed

2 files changed

+7
-21
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,7 @@ cmake_path(NORMAL_PATH UR_INTREE_SOURCE_DIR OUTPUT_VARIABLE UR_INTREE_SOURCE_DIR
7575

7676
if(IS_DIRECTORY "${UR_INTREE_SOURCE_DIR}")
7777
set(UR_INTREE_BINARY_DIR ${LLVM_BINARY_DIR}/unified-runtime)
78-
set(UNIFIED_RUNTIME_SOURCE_DIR
79-
"${UR_INTREE_SOURCE_DIR}" CACHE PATH
80-
"Path to Unified Runtime Headers" FORCE)
81-
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
82-
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
83-
# to link statically on windows
84-
if(WIN32)
85-
set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
86-
set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
87-
else()
88-
set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF")
89-
endif()
90-
add_subdirectory(${UNIFIED_RUNTIME_SOURCE_DIR} ${UR_INTREE_BINARY_DIR})
78+
add_subdirectory(${UR_INTREE_SOURCE_DIR} ${UR_INTREE_BINARY_DIR})
9179
elseif(SYCL_UR_USE_FETCH_CONTENT)
9280
include(FetchContent)
9381

@@ -134,7 +122,7 @@ elseif(SYCL_UR_USE_FETCH_CONTENT)
134122
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
135123
endfunction()
136124

137-
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
125+
set(UNIFIED_RUNTIME_REPO "https://github.com/rafbiels/unified-runtime.git")
138126
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake)
139127

140128
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
# commit d03f19a88e42cb98be9604ff24b61190d1e48727
2-
# Merge: 3ce6fcc9 84454b0e
3-
# Author: Kenneth Benzie (Benie) <[email protected]>
4-
# Date: Thu Feb 13 11:43:34 2025 +0000
5-
# Merge pull request #2680 from ldorau/Set_UMF_CUDA_INCLUDE_DIR_to_not_fetch_cudart_from_gitlab
6-
# Do not fetch cudart from gitlab for UMF
7-
set(UNIFIED_RUNTIME_TAG d03f19a88e42cb98be9604ff24b61190d1e48727)
1+
# commit 4ae15957e0c7575cde45d9d3ae01bd334e052e95
2+
# Author: Rafal Bielski <[email protected]>
3+
# Date: Fri Feb 7 19:22:22 2025 +0000
4+
# Avoid unnecessary calls to cuFuncSetAttribute
5+
set(UNIFIED_RUNTIME_TAG cuda-avoid-cuFuncSetAttribute)

0 commit comments

Comments
 (0)