Skip to content

Commit

Permalink
[common] Bump UMF to early 0.11 version, from main
Browse files Browse the repository at this point in the history
It includes i.a. MacOS fix for compiler.
  • Loading branch information
lukaszstolarczuk committed Jan 24, 2025
1 parent c685944 commit 9ee874c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions source/common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2022-2023 Intel Corporation
# Copyright (C) 2022-2025 Intel Corporation
# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
# See LICENSE.TXT
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
Expand Down Expand Up @@ -32,10 +32,12 @@ if (NOT DEFINED UMF_REPO)
endif()

if (NOT DEFINED UMF_TAG)
# Tagger: Łukasz Stolarczuk <lukasz.stolarczuk@intel.com>
# Date: Fri Jan 10 13:30:49 2025 +0100
# 0.10.1 release
set(UMF_TAG v0.10.1)
# commit 0e2dab29cf16e4153caf51e3bf0cfe54f3a4fbef
# Author: Rafał Rudnicki <rafal.rudnicki@intel.com>
# Date: Thu Jan 23 11:55:55 2025 +0100
# Merge pull request #1054 from ldorau/Add_timeout_to_the_add_umf_ipc_example_function
# Add timeout to the add_umf_ipc_example function
set(UMF_TAG 0e2dab29cf16e4153caf51e3bf0cfe54f3a4fbef)
endif()

message(STATUS "Will fetch Unified Memory Framework from ${UMF_REPO}")
Expand Down
4 changes: 2 additions & 2 deletions source/common/umf_helpers.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (C) 2023-2024 Intel Corporation
* Copyright (C) 2023-2025 Intel Corporation
*
* Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM
* Exceptions. See LICENSE.TXT
Expand Down Expand Up @@ -168,7 +168,7 @@ auto memoryProviderMakeUnique(Args &&...args) {
UMF_ASSIGN_OP(ops, T, get_recommended_page_size, UMF_RESULT_ERROR_UNKNOWN);
UMF_ASSIGN_OP(ops, T, get_min_page_size, UMF_RESULT_ERROR_UNKNOWN);
UMF_ASSIGN_OP(ops, T, get_name, "");
UMF_ASSIGN_OP(ops.ext, T, free, UMF_RESULT_ERROR_UNKNOWN);
UMF_ASSIGN_OP(ops, T, free, UMF_RESULT_ERROR_UNKNOWN);
UMF_ASSIGN_OP(ops.ext, T, purge_lazy, UMF_RESULT_ERROR_UNKNOWN);
UMF_ASSIGN_OP(ops.ext, T, purge_force, UMF_RESULT_ERROR_UNKNOWN);
UMF_ASSIGN_OP(ops.ext, T, allocation_merge, UMF_RESULT_ERROR_UNKNOWN);
Expand Down

0 comments on commit 9ee874c

Please sign in to comment.