Use VTKM_DIY()
to include diy headers.
This makes it easier to mangle diy and support using external diy.
This commit is contained in:
parent
92cf8bf6d4
commit
37969e9602
@ -21,8 +21,10 @@
|
||||
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
|
||||
#include <diy/mpi.hpp>
|
||||
// clang-format off
|
||||
#include <vtkm/cont/EnvironmentTracker.h>
|
||||
#include VTKM_DIY(diy/mpi.hpp)
|
||||
// clang-format on
|
||||
|
||||
#include <algorithm> // std::lower_bound
|
||||
#include <numeric> // std::iota
|
||||
|
@ -21,11 +21,15 @@
|
||||
#define vtk_m_cont_AssignerMultiBlock_h
|
||||
|
||||
#include <vtkm/internal/Configure.h>
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
|
||||
#include <diy/assigner.hpp>
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
#include <vtkm/cont/MultiBlock.h>
|
||||
|
||||
// clang-format off
|
||||
#include <vtkm/thirdparty/diy/Configure.h>
|
||||
#include VTKM_DIY(diy/assigner.hpp)
|
||||
// clang-format on
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
namespace cont
|
||||
|
@ -20,7 +20,12 @@
|
||||
#include <vtkm/cont/EnvironmentTracker.h>
|
||||
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
#include <diy/mpi.hpp>
|
||||
|
||||
// clang-format off
|
||||
#include <vtkm/thirdparty/diy/Configure.h>
|
||||
#include VTKM_DIY(diy/mpi.hpp)
|
||||
// clang-format on
|
||||
|
||||
#else
|
||||
namespace diy
|
||||
{
|
||||
|
@ -25,6 +25,11 @@
|
||||
#include <vtkm/internal/Configure.h>
|
||||
#include <vtkm/internal/ExportMacros.h>
|
||||
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
// needed for diy mangling.
|
||||
#include <vtkm/thirdparty/diy/Configure.h>
|
||||
#endif
|
||||
|
||||
namespace diy
|
||||
{
|
||||
namespace mpi
|
||||
|
@ -32,11 +32,14 @@
|
||||
#include <vtkm/cont/MultiBlock.h>
|
||||
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
#include <diy/decomposition.hpp>
|
||||
#include <diy/master.hpp>
|
||||
#include <diy/partners/all-reduce.hpp>
|
||||
#include <diy/partners/swap.hpp>
|
||||
#include <diy/reduce.hpp>
|
||||
// clang-format off
|
||||
#include <vtkm/thirdparty/diy/Configure.h>
|
||||
#include VTKM_DIY(diy/decomposition.hpp)
|
||||
#include VTKM_DIY(diy/master.hpp)
|
||||
#include VTKM_DIY(diy/partners/all-reduce.hpp)
|
||||
#include VTKM_DIY(diy/partners/swap.hpp)
|
||||
#include VTKM_DIY(diy/reduce.hpp)
|
||||
// clang-format on
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -36,7 +36,12 @@
|
||||
#include <vtkm/exec/ConnectivityStructured.h>
|
||||
|
||||
#if defined(VTKM_ENABLE_MPI)
|
||||
#include <diy/master.hpp>
|
||||
|
||||
// clang-format off
|
||||
#include <vtkm/thirdparty/diy/Configure.h>
|
||||
#include VTKM_DIY(diy/master.hpp)
|
||||
// clang-format on
|
||||
|
||||
#endif
|
||||
|
||||
void DataSet_Compare(vtkm::cont::DataSet& LeftDateSet, vtkm::cont::DataSet& RightDateSet);
|
||||
|
Loading…
Reference in New Issue
Block a user