Skip to content

Commit a5b080d

Browse files
[common] Bump UMF to early 0.11 version, from main
It includes i.a. MacOS fix for compiler.
1 parent f85255e commit a5b080d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

source/common/CMakeLists.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2022-2023 Intel Corporation
1+
# Copyright (C) 2022-2025 Intel Corporation
22
# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
33
# See LICENSE.TXT
44
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -28,14 +28,16 @@ target_include_directories(ur_common PUBLIC
2828

2929
message(STATUS "Download Unified Memory Framework from github.com")
3030
if (NOT DEFINED UMF_REPO)
31-
set(UMF_REPO "https://github.com/oneapi-src/unified-memory-framework.git")
31+
set(UMF_REPO "https://github.com/lukaszstolarczuk/unified-memory-framework.git")
3232
endif()
3333

3434
if (NOT DEFINED UMF_TAG)
35-
# Tagger: Łukasz Stolarczuk <[email protected]>
36-
# Date: Fri Jan 10 13:30:49 2025 +0100
37-
# 0.10.1 release
38-
set(UMF_TAG v0.10.1)
35+
# commit ada63d7e744066953923e04c8a0b0cd2f30757e8 (HEAD -> hwloc-revert-examples-win, origin/hwloc-revert-examples-win)
36+
# Author: Łukasz Stolarczuk <[email protected]>
37+
# Date: Fri Jan 24 12:58:01 2025 +0100
38+
# Revert changes for Win static hwloc
39+
# Ref. https://github.com/oneapi-src/unified-memory-framework/pull/1016
40+
set(UMF_TAG ada63d7e744066953923e04c8a0b0cd2f30757e8)
3941
endif()
4042

4143
message(STATUS "Will fetch Unified Memory Framework from ${UMF_REPO}")

source/common/umf_helpers.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
*
3-
* Copyright (C) 2023-2024 Intel Corporation
3+
* Copyright (C) 2023-2025 Intel Corporation
44
*
55
* Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM
66
* Exceptions. See LICENSE.TXT
@@ -168,7 +168,7 @@ auto memoryProviderMakeUnique(Args &&...args) {
168168
UMF_ASSIGN_OP(ops, T, get_recommended_page_size, UMF_RESULT_ERROR_UNKNOWN);
169169
UMF_ASSIGN_OP(ops, T, get_min_page_size, UMF_RESULT_ERROR_UNKNOWN);
170170
UMF_ASSIGN_OP(ops, T, get_name, "");
171-
UMF_ASSIGN_OP(ops.ext, T, free, UMF_RESULT_ERROR_UNKNOWN);
171+
UMF_ASSIGN_OP(ops, T, free, UMF_RESULT_ERROR_UNKNOWN);
172172
UMF_ASSIGN_OP(ops.ext, T, purge_lazy, UMF_RESULT_ERROR_UNKNOWN);
173173
UMF_ASSIGN_OP(ops.ext, T, purge_force, UMF_RESULT_ERROR_UNKNOWN);
174174
UMF_ASSIGN_OP(ops.ext, T, allocation_merge, UMF_RESULT_ERROR_UNKNOWN);

0 commit comments

Comments
 (0)