Skip to content

DRAFT: Avoid potential ambiguity in UrReturnHelper #15895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

DRAFT: Avoid potential ambiguity in UrReturnHelper #15895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT)
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
set(UNIFIED_RUNTIME_REPO "https://github.com/hvdijk/unified-runtime.git")
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
Expand Down
20 changes: 13 additions & 7 deletions sycl/cmake/modules/UnifiedRuntimeTag.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# commit 3d58884b4939d9bd095c917f8dd823ac8486684c
# Merge: 6ade245e b0bd146a
# Author: aarongreig <aaron.greig@codeplay.com>
# Date: Thu Oct 31 14:05:55 2024 +0000
# Merge pull request #2228 from nrspruit/copy_engine_refactor
# [L0] Refactor Copy Engine Usage checks for Performance
set(UNIFIED_RUNTIME_TAG 3d58884b4939d9bd095c917f8dd823ac8486684c)
# commit f6d00b8a95ddc41e17ac2faeba13afacd48252d2
# Author: Harald van Dijk <harald.vandijk@codeplay.com>
# Date: Fri Nov 1 11:08:39 2024 +0000
#
# Avoid potential ambiguity in UrReturnHelper
#
# If UrReturnHelper's operator() is explicitly called as
# operator()<T>(...), there is a potential for ambiguity when the
# specified RetType and the inferred T are the same: this is ambiguous
# with the version of operator() where only T is a template parameter,
# and T is specified explicitly. We already have code that explicitly
# calls operator()<T>(...), so prevent this from becoming a problem.
set(UNIFIED_RUNTIME_TAG f6d00b8a95ddc41e17ac2faeba13afacd48252d2)
Loading