mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Correct location of ThrustPatches which clang formatter moved
This commit is contained in:
parent
bd544754a4
commit
63c931e639
@ -28,10 +28,10 @@
|
||||
//the interface without getting any CUDA headers
|
||||
#include <vtkm/cont/cuda/internal/ExecutionArrayInterfaceBasicCuda.h>
|
||||
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
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>
|
||||
|
@ -39,7 +39,11 @@
|
||||
#include <vtkm/exec/internal/ErrorMessageBuffer.h>
|
||||
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
//needs to be first
|
||||
#include <vtkm/exec/cuda/internal/ExecutionPolicy.h>
|
||||
|
||||
#include <cooperative_groups.h>
|
||||
#include <cuda.h>
|
||||
#include <thrust/advance.h>
|
||||
@ -52,8 +56,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system/cpp/memory.h>
|
||||
#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
|
||||
|
||||
#include <limits>
|
||||
|
@ -21,9 +21,9 @@
|
||||
#include <vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h>
|
||||
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/device_ptr.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -14,9 +14,9 @@
|
||||
#include <vtkm/cont/ErrorExecution.h>
|
||||
#include <vtkm/internal/ExportMacros.h>
|
||||
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system_error.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -16,9 +16,9 @@
|
||||
#include <iterator>
|
||||
#include <type_traits>
|
||||
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system/cuda/memory.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -14,11 +14,11 @@
|
||||
#include <vtkm/cont/cuda/ErrorCuda.h>
|
||||
#include <vtkm/exec/cuda/internal/WrappedOperators.h>
|
||||
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
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)
|
||||
|
@ -16,11 +16,11 @@
|
||||
#include <vtkm/internal/ExportMacros.h>
|
||||
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
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
|
||||
|
@ -17,9 +17,9 @@
|
||||
#include <vtkm/internal/ExportMacros.h>
|
||||
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/system/cuda/memory.h>
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_POST_INCLUDE
|
||||
|
||||
namespace vtkm
|
||||
|
@ -18,12 +18,12 @@
|
||||
#include <vtkm/interop/internal/TransferToOpenGL.h>
|
||||
|
||||
// Disable warnings we check vtkm for but Thrust does not.
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
#include <thrust/copy.h>
|
||||
#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
|
||||
|
@ -37,9 +37,9 @@
|
||||
THRUST_SUBMINOR_VERSION < 3
|
||||
// Workaround a bug in thrust 1.8.0 - 1.8.2 scan implementations which produces
|
||||
// wrong results
|
||||
#include <vtkm/exec/cuda/internal/ThrustPatches.h>
|
||||
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