Skip to content

[SYCL][NFC] Fix min/max conflict on Windows #7768

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 1 commit into from
Dec 13, 2022
Merged

[SYCL][NFC] Fix min/max conflict on Windows #7768

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/include/sycl/detail/group_sort_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ uint32_t getBucketValue(ValT value, uint32_t radix_iter) {
}
template <typename ValT> ValT getDefaultValue(bool is_comp_asc) {
if (is_comp_asc)
return std::numeric_limits<ValT>::max();
return (std::numeric_limits<ValT>::max)();
else
return std::numeric_limits<ValT>::lowest();
}
Expand Down
6 changes: 3 additions & 3 deletions sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class radix_sorter {
radix_sorter(sycl::span<std::byte, Extent> scratch_,
const std::bitset<sizeof(ValT) *CHAR_BIT> mask =
std::bitset<sizeof(ValT) * CHAR_BIT>(
std::numeric_limits<unsigned long long>::max()))
(std::numeric_limits<unsigned long long>::max)()))
: scratch(scratch_.data()), scratch_size(scratch_.size()) {
static_assert((std::is_arithmetic<ValT>::value ||
std::is_same<ValT, sycl::half>::value ||
Expand Down Expand Up @@ -187,8 +187,8 @@ class radix_sorter {
sycl::range<dimensions> local_range) {
// Scope is not important so far
(void)scope;
return std::max(local_range.size() * sizeof(ValT),
local_range.size() * (1 << bits) * sizeof(uint32_t));
return (std::max)(local_range.size() * sizeof(ValT),
local_range.size() * (1 << bits) * sizeof(uint32_t));
}
};

Expand Down