Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Use VTKM_BOOST_PRE_INCLUDE around thrust headers too.

Browse Source
This commit is contained in:
Robert Maynard 2015-08-12 14:41:29 -04:00
parent 472dadef00
commit 8204db2f6a
7 changed files with 17 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h
View File

@ -25,20 +25,11 @@
#include <vtkm/cont/Storage.h>
// Disable warnings we check vtkm for but Thrust does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
VTKM_BOOST_PRE_INCLUDE
#include <thrust/system/cuda/vector.h>
#include <thrust/device_malloc_allocator.h>
#include <thrust/copy.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
#endif // gcc || clang
VTKM_BOOST_POST_INCLUDE
#include <vtkm/exec/cuda/internal/ArrayPortalFromThrust.h>

13
vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h
View File

@ -35,13 +35,7 @@
#include <vtkm/exec/cuda/internal/WrappedOperators.h>
// Disable warnings we check vtkm for but Thrust does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
VTKM_BOOST_PRE_INCLUDE
#include <thrust/advance.h>
#include <thrust/binary_search.h>
#include <thrust/copy.h>
@ -53,10 +47,7 @@
#include <thrust/iterator/counting_iterator.h>
#include <thrust/system/cuda/execution_policy.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
#endif // gcc || clang
VTKM_BOOST_POST_INCLUDE
namespace vtkm {
namespace cont {

13
vtkm/cont/cuda/internal/MakeThrustIterator.h
View File

@ -29,21 +29,12 @@
#include <vtkm/exec/cuda/internal/WrappedOperators.h>
// Disable warnings we check vtkm for but Thrust does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
VTKM_BOOST_PRE_INCLUDE
#include <thrust/system/cuda/memory.h>
#include <thrust/functional.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
#endif // gcc || clang
VTKM_BOOST_POST_INCLUDE
namespace vtkm {
namespace cont {

17
vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
View File

@ -34,16 +34,9 @@
VTKM_BOOST_PRE_INCLUDE
#include <boost/type_traits/remove_reference.hpp>
VTKM_BOOST_POST_INCLUDE
// Disable warnings we check vtkm for but TBB does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
// gcc || clang
#elif _WIN32
#if defined(_WIN32)
// TBB includes windows.h, which clobbers min and max functions so we
// define NOMINMAX to fix that problem. We also include WIN32_LEAN_AND_MEAN
// to reduce the number of macros and objects windows.h imports as those also
@ -69,15 +62,13 @@ VTKM_BOOST_POST_INCLUDE
#include <tbb/partitioner.h>
#include <tbb/tick_count.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
// gcc || clang
#elif _WIN32
#if defined(_WIN32)
#undef WIN32_LEAN_AND_MEAN
#undef NOMINMAX
#endif
VTKM_BOOST_POST_INCLUDE
namespace vtkm {
namespace cont {

19
vtkm/exec/cuda/internal/ArrayPortalFromThrust.h
View File

@ -24,26 +24,13 @@
#include <vtkm/cont/ArrayPortalToIterators.h>
#include <iterator>
VTKM_BOOST_PRE_INCLUDE
#include <boost/type_traits/remove_const.hpp>
VTKM_BOOST_POST_INCLUDE
// Disable warnings we check vtkm for but Thrust does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
#include <thrust/system/cuda/memory.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
#endif // gcc || clang
VTKM_BOOST_PRE_INCLUDE
#include <boost/type_traits/integral_constant.hpp>
#include <boost/utility/enable_if.hpp>
#include <thrust/system/cuda/memory.h>
VTKM_BOOST_POST_INCLUDE
namespace vtkm {

13
vtkm/exec/cuda/internal/IteratorFromArrayPortal.h
View File

@ -25,20 +25,11 @@
#include <vtkm/internal/ExportMacros.h>
// Disable warnings we check vtkm for but Thrust does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
VTKM_BOOST_PRE_INCLUDE
#include <thrust/functional.h>
#include <thrust/iterator/iterator_facade.h>
#include <thrust/system/cuda/execution_policy.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
#endif // gcc || clang
VTKM_BOOST_POST_INCLUDE
namespace vtkm {
namespace exec {

13
vtkm/exec/cuda/internal/WrappedOperators.h
View File

@ -26,18 +26,9 @@
#include <vtkm/exec/cuda/internal/IteratorFromArrayPortal.h>
// Disable warnings we check vtkm for but Thrust does not.
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
VTKM_BOOST_PRE_INCLUDE
#include <thrust/system/cuda/memory.h>
#if defined(VTKM_GCC) || defined(VTKM_CLANG)
#pragma GCC diagnostic pop
#endif // gcc || clang
VTKM_BOOST_POST_INCLUDE
namespace vtkm {
namespace exec {