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

Merge branch 'upstream-diy' into update_diy_to_namespace_DEBUG_define

Browse Source 
* upstream-diy:
  diy 2020-06-24 (ab765e66)
This commit is contained in:
Robert Maynard 2020-07-01 08:28:17 -04:00
commit a1680ef8bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)
{