Skip to content

[SYCL] Fix compilation fail on Windows #6257

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
Jun 6, 2022
Merged

[SYCL] Fix compilation fail on Windows #6257

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
058b986
[SYCL] Fix compilation fail on Windows
aelovikov-intel Jun 6, 2022
923c7e5
Don't bring std::max into the scope, we already have some max
aelovikov-intel Jun 6, 2022
5ba7a9d
clang-format + the same fix in usm.hpp
aelovikov-intel Jun 6, 2022
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
6 changes: 3 additions & 3 deletions sycl/include/CL/sycl/usm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ T *aligned_alloc_device(
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
const property_list &PropList = {},
const detail::code_location CodeLoc = detail::code_location::current()) {
return static_cast<T *>(aligned_alloc_device(std::max(Alignment, alignof(T)),
return static_cast<T *>(aligned_alloc_device(max(Alignment, alignof(T)),
Count * sizeof(T), Dev, Ctxt,
PropList, CodeLoc));
}
Expand Down Expand Up @@ -244,7 +244,7 @@ T *aligned_alloc_shared(
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
const property_list &PropList = {},
const detail::code_location CodeLoc = detail::code_location::current()) {
return static_cast<T *>(aligned_alloc_shared(std::max(Alignment, alignof(T)),
return static_cast<T *>(aligned_alloc_shared(max(Alignment, alignof(T)),
Count * sizeof(T), Dev, Ctxt,
PropList, CodeLoc));
}
Expand Down Expand Up @@ -281,7 +281,7 @@ T *aligned_alloc(
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
usm::alloc Kind, const property_list &PropList = {},
const detail::code_location CodeLoc = detail::code_location::current()) {
return static_cast<T *>(aligned_alloc(std::max(Alignment, alignof(T)),
return static_cast<T *>(aligned_alloc(max(Alignment, alignof(T)),
Count * sizeof(T), Dev, Ctxt, Kind,
PropList, CodeLoc));
}
Expand Down
4 changes: 1 addition & 3 deletions sycl/include/CL/sycl/usm/usm_allocator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ class usm_allocator {
}

private:
constexpr size_t getAlignment() const {
return std::max(alignof(T), Alignment);
}
constexpr size_t getAlignment() const { return max(alignof(T), Alignment); }

template <class U, usm::alloc AllocKindU, size_t AlignmentU>
friend class usm_allocator;
Expand Down