Skip to content

[SYCL][NFC] Fix ctad warnings #16054

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

Merged
merged 3 commits into from
Nov 13, 2024
Merged

[SYCL][NFC] Fix ctad warnings #16054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb441b9
[NFC] Fix ctad warnings
jsji Nov 12, 2024
e10e5a2
clangformat
jsji Nov 12, 2024
be189be
fix in unitests
jsji Nov 12, 2024
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
3 changes: 2 additions & 1 deletion sycl/source/detail/context_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,8 @@ std::optional<ur_program_handle_t> context_impl::getProgramForDevImgs(
auto &Cache = LockedCache.get().Cache;
ur_device_handle_t &DevHandle = getSyclObjImpl(Device)->getHandleRef();
for (std::uintptr_t ImageIDs : ImgIdentifiers) {
auto OuterKey = std::make_pair(ImageIDs, std::set{DevHandle});
auto OuterKey =
std::make_pair(ImageIDs, std::set<ur_device_handle_t>{DevHandle});
size_t NProgs = KeyMap.count(OuterKey);
if (NProgs == 0)
continue;
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/detail/program_manager/program_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ ur_program_handle_t ProgramManager::getBuiltURProgram(
uint32_t ImgId = Img.getImageID();
const ur_device_handle_t UrDevice = Dev->getHandleRef();
auto CacheKey = std::make_pair(std::make_pair(std::move(SpecConsts), ImgId),
std::set{UrDevice});
std::set<ur_device_handle_t>{UrDevice});

auto GetCachedBuildF = [&Cache, &CacheKey]() {
return Cache.getOrInsertProgram(CacheKey);
Expand Down
3 changes: 2 additions & 1 deletion sycl/unittests/helpers/MockDeviceImage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ class MockPropertySet {
/// \param Name is a property name. See ur.hpp for list of known names.
/// \param Prop is a property value.
void insert(const std::string &Name, MockProperty &&Props) {
insert(Name, internal::LifetimeExtender{std::vector{std::move(Props)}});
insert(Name, internal::LifetimeExtender{
std::vector<MockProperty>{std::move(Props)}});
}

/// Adds a new array of properties to the set.
Expand Down
Loading