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: Fix Thrust/CUB tests by adding empty base opt-ins to iterator classes (#3066) #3068

Merged
merged 2 commits into from
Dec 6, 2024
Merged

[BACKPORT: Fix Thrust/CUB tests by adding empty base opt-ins to iterator classes (#3066) #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16bf95a
Fix Thrust/CUB tests by adding empty base opt-ins to iterator classes…
wmaxey Dec 6, 2024
d1b76e5
Fix cudax samples pulling in main
miscco Dec 6, 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
2 changes: 1 addition & 1 deletion cudax/samples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set(CCCL_TAG "main" CACHE STRING "Git tag/branch to fetch from CCCL repository")
CPMAddPackage(
NAME CCCL
GITHUB_REPOSITORY ${CCCL_REPOSITORY}
GIT_TAG ${CCCL_TAG}
GIT_TAG branch/2.7.x
GIT_SHALLOW ON
# The following is required to make the `CCCL::cudax` target available:
OPTIONS "CCCL_ENABLE_UNSTABLE ON"
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/std/detail/libcxx/include/tuple
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ struct __tuple_variadic_constructor_tag
// __tuple_impl

template <class _Indx, class... _Tp>
struct __tuple_impl;
struct _LIBCUDACXX_DECLSPEC_EMPTY_BASES __tuple_impl;

template <size_t... _Indx, class... _Tp>
struct _LIBCUDACXX_DECLSPEC_EMPTY_BASES __tuple_impl<__tuple_indices<_Indx...>, _Tp...>
Expand Down
3 changes: 2 additions & 1 deletion thrust/thrust/iterator/counting_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ template <typename Incrementable,
typename System = use_default,
typename Traversal = use_default,
typename Difference = use_default>
class counting_iterator : public detail::counting_iterator_base<Incrementable, System, Traversal, Difference>::type
class _LIBCUDACXX_DECLSPEC_EMPTY_BASES counting_iterator
: public detail::counting_iterator_base<Incrementable, System, Traversal, Difference>::type
{
/*! \cond
*/
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/iterator/iterator_adaptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ template <typename Derived,
typename Traversal = use_default,
typename Reference = use_default,
typename Difference = use_default>
class iterator_adaptor
class _LIBCUDACXX_DECLSPEC_EMPTY_BASES iterator_adaptor
: public detail::iterator_adaptor_base<Derived, Base, Value, System, Traversal, Reference, Difference>::type
{
/*! \cond
Expand Down
Loading