Skip to content

Commit f7cd500

Browse files
authored
Merge pull request #2596 from lukaszstolarczuk/bump-umf-0.11
[common] Bump UMF to early 0.11 version, from main
2 parents ef3f222 + 75bb252 commit f7cd500

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

source/common/CMakeLists.txt

Lines changed: 6 additions & 5 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
@@ -32,10 +32,11 @@ if (NOT DEFINED UMF_REPO)
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 6709535de92933d6bfc1e1d19a324f17afec3877
36+
# Author: Rafał Rudnicki <[email protected]>
37+
# Date: Mon Jan 27 10:57:57 2025 +0100
38+
# Merge pull request #1056 from lukaszstolarczuk/hwloc-revert-examples-win
39+
set(UMF_TAG 6709535de92933d6bfc1e1d19a324f17afec3877)
3940
endif()
4041

4142
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)