Skip to content

Fix compatibility with Thrust 1.10.0 #46

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
mborland merged 1 commit into from
Jan 2, 2024
Merged

Fix compatibility with Thrust 1.10.0 #46

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
13 changes: 12 additions & 1 deletion include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,18 @@ struct algebra_dispatcher< thrust::device_vector< T , A > >

#include <thrust/version.h>

#if THRUST_VERSION >= 100600
#if THRUST_VERSION >= 101000

#include <thrust/detail/vector_base.h>
namespace boost { namespace numeric { namespace odeint {
template< class T , class A >
struct algebra_dispatcher< thrust::detail::vector_base< T , A > >
{
typedef thrust_algebra algebra_type;
};
} } }

#elif THRUST_VERSION >= 100600

// specialization for thrust cpp vector
#include <thrust/system/cpp/vector.h>
Expand Down
13 changes: 12 additions & 1 deletion include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,18 @@ struct operations_dispatcher< thrust::device_vector< T , A > >

#include <thrust/version.h>

#if THRUST_VERSION >= 100600
#if THRUST_VERSION >= 101000

#include <thrust/detail/vector_base.h>
namespace boost { namespace numeric { namespace odeint {
template< class T , class A >
struct operations_dispatcher< thrust::detail::vector_base< T , A > >
{
typedef thrust_operations operations_type;
};
} } }

#elif THRUST_VERSION >= 100600

// specialization for thrust cpp vector
#include <thrust/system/cpp/vector.h>
Expand Down
12 changes: 11 additions & 1 deletion include/boost/numeric/odeint/external/thrust/thrust_resize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,17 @@ ODEINT_THRUST_COPY_IMPL( thrust::host_vector )

#include <thrust/version.h>

#if THRUST_VERSION >= 100600
#if THRUST_VERSION >= 101000

#include <thrust/detail/vector_base.h>
namespace boost { namespace numeric { namespace odeint {
ODEINT_THRUST_VECTOR_IS_RESIZEABLE( thrust::detail::vector_base )
ODEINT_TRHUST_VECTOR_RESIZE_IMPL( thrust::detail::vector_base )
ODEINT_THRUST_SAME_SIZE_IMPL( thrust::detail::vector_base )
ODEINT_THRUST_COPY_IMPL( thrust::detail::vector_base )
} } }

#elif THRUST_VERSION >= 100600

#include <thrust/system/cpp/vector.h>
namespace boost { namespace numeric { namespace odeint {
Expand Down