mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Make sure ThrustPatches is included before thrust.
This commit is contained in:
parent
b2bbd66e60
commit
f4840618cf
@ -41,6 +41,7 @@
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/copy.h>
|
||||
#include <thrust/device_ptr.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
#include <limits>
|
||||
|
@ -43,12 +43,8 @@
|
||||
#include <vtkm/cont/cuda/internal/ThrustExceptionHandler.h>
|
||||
#include <vtkm/exec/cuda/internal/WrappedOperators.h>
|
||||
|
||||
#include <vtkm/exec/internal/ErrorMessageBuffer.h>
|
||||
|
||||
|
||||
#include <vtkm/exec/cuda/internal/TaskStrided.h>
|
||||
|
||||
#include <cuda.h>
|
||||
#include <vtkm/exec/internal/ErrorMessageBuffer.h>
|
||||
|
||||
// #define PARAMETER_SWEEP_VTKM_SCHEDULER_1D
|
||||
// #define PARAMETER_SWEEP_VTKM_SCHEDULER_3D
|
||||
@ -58,7 +54,9 @@
|
||||
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
//our own custom thrust execution policy
|
||||
//This is required to be first so that we get patches for thrust included
|
||||
//in the correct order
|
||||
#include <cuda.h>
|
||||
#include <thrust/advance.h>
|
||||
#include <thrust/binary_search.h>
|
||||
#include <thrust/copy.h>
|
||||
@ -70,6 +68,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system/cuda/vector.h>
|
||||
#include <thrust/unique.h>
|
||||
#include <vtkm/exec/cuda/internal/ExecutionPolicy.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -33,6 +33,7 @@
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/device_ptr.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -26,6 +26,7 @@
|
||||
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system_error.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -28,6 +28,7 @@
|
||||
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system/cuda/memory.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -29,6 +29,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/execution_policy.h>
|
||||
#include <thrust/system/cuda/execution_policy.h>
|
||||
#include <thrust/system/cuda/memory.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
#define ThrustCudaPolicyPerThread ::thrust::cuda::par.on(cudaStreamPerThread)
|
||||
|
@ -30,6 +30,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/functional.h>
|
||||
#include <thrust/iterator/iterator_facade.h>
|
||||
#include <thrust/system/cuda/execution_policy.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -29,6 +29,7 @@
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system/cuda/memory.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -33,6 +33,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/device_ptr.h>
|
||||
#include <thrust/system/cuda/execution_policy.h>
|
||||
#include <vtkm/exec/cuda/internal/ExecutionPolicy.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -49,6 +49,7 @@
|
||||
// wrong results
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/detail/type_traits.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
#define THRUST_SCAN_WORKAROUND
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user