Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'update_diy_to_namespace_DEBUG_define'

Browse Source 
a1680ef8b Merge branch 'upstream-diy' into update_diy_to_namespace_DEBUG_define
de03d7bab diy 2020-06-24 (ab765e66)
f7b3d1bca Update DIY to not leak the `DEBUG` define
7c66b1dd6 Update contour_tree_distributed to work with the new diy API

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2162
This commit is contained in:
Robert Maynard 2020-07-01 14:03:21 +00:00 committed by Kitware Robot
commit b78e98adee
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/contour_tree_distributed/CMakeLists.txt
View File

@ -60,7 +60,7 @@ find_package(VTKm REQUIRED QUIET)
####################################
if (VTKm_ENABLE_MPI)
add_executable(ContourTree_Distributed ContourTreeApp.cxx)
target_link_libraries(ContourTree_Distributed vtkm_filter)
target_link_libraries(ContourTree_Distributed vtkm_filter MPI::MPI_CXX)
vtkm_add_target_information(ContourTree_Distributed
MODIFY_CUDA_FLAGS
DEVICE_SOURCES ContourTreeApp.cxx)

2
examples/contour_tree_distributed/ContourTreeApp.cxx
View File

@ -160,7 +160,7 @@ int main(int argc, char* argv[])
auto comm = MPI_COMM_WORLD;
// Tell VTK-m which communicator it should use.
vtkm::cont::EnvironmentTracker::SetCommunicator(vtkmdiy::mpi::communicator(comm));
vtkm::cont::EnvironmentTracker::SetCommunicator(vtkmdiy::mpi::communicator());
// get the rank and size
int rank, size;

2
vtkm/thirdparty/diy/update.sh vendored
View File

@ -8,7 +8,7 @@ readonly name="diy"
readonly ownership="Diy Upstream <kwrobot@kitware.com>"
readonly subtree="vtkm/thirdparty/$name/vtkm$name"
readonly repo="https://gitlab.kitware.com/third-party/diy2.git"
readonly tag="for/vtk-m-20200608-master"
readonly tag="for/vtk-m-20200626-master"
readonly paths="
cmake
include

2
vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt vendored
View File

@ -59,7 +59,7 @@ set (diy_libraries "")
# Debugging
if (${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR
${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
list (APPEND diy_definitions "-DDEBUG")
list (APPEND diy_definitions "-DVTKMDIY_DEBUG")
endif ()
# Logging

4
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/master.hpp vendored
View File

@ -1143,7 +1143,7 @@ void
diy::Master::
flush(bool remote)
{
#ifdef DEBUG
#ifdef VTKMDIY_DEBUG
time_type start = get_time();
unsigned wait = 1;
#endif
@ -1163,7 +1163,7 @@ flush(bool remote)
{
comm_exchange(gid_order);
#ifdef DEBUG
#ifdef VTKMDIY_DEBUG
time_type cur = get_time();
if (cur - start > wait*1000)
{