Skip to content

Commit 627492c

Browse files
authored
Merge pull request #2680 from ldorau/Set_UMF_CUDA_INCLUDE_DIR_to_not_fetch_cudart_from_gitlab
Do not fetch cudart from gitlab for UMF
2 parents dd1a3e1 + 66870b4 commit 627492c

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

source/common/CMakeLists.txt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ else()
1111
set(UMF_BUILD_LEVEL_ZERO_PROVIDER OFF CACHE INTERNAL "Build Level Zero Provider")
1212
endif()
1313

14+
if (UR_BUILD_ADAPTER_CUDA)
15+
find_package(CUDA 10.1 REQUIRED)
16+
set(UMF_BUILD_CUDA_PROVIDER ON CACHE INTERNAL "Build UMF CUDA provider")
17+
set(UMF_CUDA_INCLUDE_DIR "${CUDA_INCLUDE_DIRS}" CACHE INTERNAL "CUDA headers")
18+
else()
19+
set(UMF_BUILD_CUDA_PROVIDER OFF CACHE INTERNAL "Build UMF CUDA provider")
20+
endif()
21+
1422
add_ur_library(ur_common STATIC
1523
ur_util.cpp
1624
ur_util.hpp
@@ -32,12 +40,11 @@ if (NOT DEFINED UMF_REPO)
3240
endif()
3341

3442
if (NOT DEFINED UMF_TAG)
35-
# commit 222dd3d107cf1f97259ecb4bae45df3b8905725b (HEAD -> main, tag: v0.11.0-dev2)
43+
# commit ace9f4a60b686463fdad15cd016c548237cb79e0
3644
# Author: Rafał Rudnicki <[email protected]>
37-
# Date: Fri Feb 7 14:43:25 2025 +0100
38-
# Merge pull request #1084 from lukaszstolarczuk/fix-icx-build
39-
# Fix icx build
40-
set(UMF_TAG v0.11.0-dev2)
45+
# Date: Mon Feb 10 11:39:15 2025 +0100
46+
# Merge pull request #1088 from ldorau/Fix_remove_CUDA_ERROR_INVALID_RESOURCE_TYPE
47+
set(UMF_TAG ace9f4a60b686463fdad15cd016c548237cb79e0)
4148
endif()
4249

4350
message(STATUS "Will fetch Unified Memory Framework from ${UMF_REPO}")
@@ -66,7 +73,6 @@ else()
6673
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "Build UMF examples")
6774
set(UMF_BUILD_SHARED_LIBRARY ${UMF_BUILD_SHARED_LIBRARY} CACHE INTERNAL "Build UMF shared library")
6875
set(UMF_BUILD_LIBUMF_POOL_DISJOINT ON CACHE INTERNAL "Build Disjoint Pool")
69-
set(UMF_BUILD_CUDA_PROVIDER ON CACHE INTERNAL "Build UMF CUDA provider")
7076

7177
FetchContent_MakeAvailable(unified-memory-framework)
7278
FetchContent_GetProperties(unified-memory-framework)

0 commit comments

Comments
 (0)