Skip to content
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

[BACKPORT]: Try and get rapids green (#3503) #3598

Merged
merged 3 commits into from
Feb 3, 2025
Merged

[BACKPORT]: Try and get rapids green (#3503) #3598

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
fa714f8
Try and get rapids green (#3503)
miscco Jan 31, 2025
348678a
Merge branch 'branch/2.8.x' into backport_3503
miscco Feb 3, 2025
66d6abe
Merge branch 'branch/2.8.x' into backport_3503
miscco Feb 3, 2025
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
4 changes: 3 additions & 1 deletion cub/cub/util_device.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,4 +787,6 @@ private:

CUB_NAMESPACE_END

#include <cub/detail/launcher/cuda_runtime.cuh> // to complete the definition of TripleChevronFactory
#if _CCCL_HAS_CUDA_COMPILER
# include <cub/detail/launcher/cuda_runtime.cuh> // to complete the definition of TripleChevronFactory
#endif // _CCCL_HAS_CUDA_COMPILER
26 changes: 0 additions & 26 deletions libcudacxx/include/cuda/std/__mdspan/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,32 +245,6 @@ static_assert(__MDSPAN_CPLUSPLUS >= __MDSPAN_CXX_STD_14, "mdspan requires C++14
# endif
# endif

# if __MDSPAN_USE_BRACKET_OPERATOR
# define __MDSPAN_OP(mds, ...) mds[__VA_ARGS__]
// Corentins demo compiler for subscript chokes on empty [] call,
// though I believe the proposal supports it?
# ifdef __MDSPAN_NO_EMPTY_BRACKET_OPERATOR
# define __MDSPAN_OP0(mds) mds.accessor().access(mds.data_handle(), 0)
# else
# define __MDSPAN_OP0(mds) mds[]
# endif
# define __MDSPAN_OP1(mds, a) mds[a]
# define __MDSPAN_OP2(mds, a, b) mds[a, b]
# define __MDSPAN_OP3(mds, a, b, c) mds[a, b, c]
# define __MDSPAN_OP4(mds, a, b, c, d) mds[a, b, c, d]
# define __MDSPAN_OP5(mds, a, b, c, d, e) mds[a, b, c, d, e]
# define __MDSPAN_OP6(mds, a, b, c, d, e, f) mds[a, b, c, d, e, f]
# else
# define __MDSPAN_OP(mds, ...) mds(__VA_ARGS__)
# define __MDSPAN_OP0(mds) mds()
# define __MDSPAN_OP1(mds, a) mds(a)
# define __MDSPAN_OP2(mds, a, b) mds(a, b)
# define __MDSPAN_OP3(mds, a, b, c) mds(a, b, c)
# define __MDSPAN_OP4(mds, a, b, c, d) mds(a, b, c, d)
# define __MDSPAN_OP5(mds, a, b, c, d, e) mds(a, b, c, d, e)
# define __MDSPAN_OP6(mds, a, b, c, d, e, f) mds(a, b, c, d, e, f)
# endif

#endif // _CCCL_STD_VER > 2011

#endif // _LIBCUDACXX___MDSPAN_CONFIG_HPP
4 changes: 2 additions & 2 deletions ...acxx/test/libcudacxx/std/containers/views/mdspan/mdspan.mdspan.cons/ctad_c_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int main(int, char**)
assert(m.rank_dynamic() == 0);
assert(m.static_extent(0) == 5);
assert(m.extent(0) == 5);
assert(__MDSPAN_OP(m, 2) == 3);
assert(m[2] == 3);

cuda::std::mdspan m2(data, 3);

Expand All @@ -43,7 +43,7 @@ int main(int, char**)
assert(m2.rank() == 1);
assert(m2.rank_dynamic() == 1);
assert(m2.extent(0) == 3);
assert(__MDSPAN_OP(m2, 2) == 3);
assert(m2[2] == 3);
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion ...est/libcudacxx/std/containers/views/mdspan/mdspan.mdspan.cons/ctad_const_c_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int main(int, char**)
assert(m.rank_dynamic() == 0);
assert(m.static_extent(0) == 5);
assert(m.extent(0) == 5);
assert(__MDSPAN_OP(m, 2) == 3);
assert(m[2] == 3);
}
#endif

Expand Down